From 2fbed929c5995ca59a1016323bc0d8c53f2631fc Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 14 Dec 2014 23:13:08 +0000 Subject: [PATCH 1/3] I couldn't resist - most useful feature ever: Chisel is now localized in Pirate! --- .../resources/assets/chisel/lang/en_GB.lang | 4 +- .../resources/assets/chisel/lang/en_PT.lang | 991 ++++++++++++++++++ 2 files changed, 993 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/chisel/lang/en_PT.lang diff --git a/src/main/resources/assets/chisel/lang/en_GB.lang b/src/main/resources/assets/chisel/lang/en_GB.lang index 8737aabf..4b40f678 100644 --- a/src/main/resources/assets/chisel/lang/en_GB.lang +++ b/src/main/resources/assets/chisel/lang/en_GB.lang @@ -69,7 +69,7 @@ tile.hexPlating.2.desc=Brown Plating tile.hexPlating.3.desc=Cyan Plating tile.hexPlating.4.desc=Green Plating tile.hexPlating.5.desc=Light Blue Plating -tile.hexPlating.6.desc=Light Gray Plating +tile.hexPlating.6.desc=Light Grey Plating tile.hexPlating.7.desc=Lime Plating tile.hexPlating.8.desc=Magenta Plating tile.hexPlating.9.desc=Orange Plating @@ -78,7 +78,7 @@ tile.hexPlating.11.desc=Purple Plating tile.hexPlating.12.desc=Red Plating tile.hexPlating.13.desc=White Plating tile.hexPlating.14.desc=Yellow Plating -tile.hexPlating.15.desc=Gray Plating +tile.hexPlating.15.desc=Grey Plating #Grimstone tile.grimstone.name=Grimstone diff --git a/src/main/resources/assets/chisel/lang/en_PT.lang b/src/main/resources/assets/chisel/lang/en_PT.lang new file mode 100644 index 00000000..26819ca8 --- /dev/null +++ b/src/main/resources/assets/chisel/lang/en_PT.lang @@ -0,0 +1,991 @@ +# Key localizations + +# Item localizations +item.chisel.name=Ye Old Chisel +item.ballMoss.name=Ball O' Moss +item.cloudBottle.name=Cloud In A Bottle +item.smashingRock.name=Smashing Rock +item.upgrade_speed.name=Speed Upgrade +item.upgrade_automation.name=Automation Upgrade +item.upgrade_stack.name=Stack Upgrade + +item.upgrade_speed.desc=Makes it go fasta +item.upgrade_automation.desc=Allows pushin’ an’ pullin’ +item.upgrade_stack.desc=Allows manufactuarr of stacks + +# Block localizations +# Have fun! ~zombiepig333 + +#Chisel 2 + +#Auto Chisel +tile.autoChisel.base.name=Magical Chisel Block +tile.autoChisel.base.desc=Base Version +tile.autoChisel.speed.name=Auto Chisel (Speed) +tile.autoChisel.speed.desc=Speed Upgrade +tile.autoChisel.automation.name=Auto Chisel (Automation) +tile.autoChisel.automation.desc=Automation Upgrade +tile.autoChisel.stack.name=Auto Chisel (Stack) +tile.autoChisel.stack.desc=Stack Upgrade + +#Leaves +tile.leaves.6.desc=Dead Leaves +tile.leaves.7.desc=Swaggy Leaves +tile.leaves.8.desc=Pink Petals +tile.leaves.9.desc=Blood Red Rose +tile.leaves.10.desc=White Rose +tile.leaves.11.desc=Christmas Balls +tile.leaves.12.desc=Christmas Lights + +#Void Stone Blocks +tile.voidstone.name=Voidstone +tile.voidstone.0.desc=Metal-BordeBlood Red Voidstone +tile.voidstone.1.desc=Large Voidstone tiles +tile.voidstone.2.desc=Smooth Voidstone +tile.voidstone.12.desc=Runic Voidstone +tile.voidstone.13.desc=Raw Voidstone +tile.voidstone.14.desc=Eye Voidstone +tile.voidstone.15.desc=Beveled Voidstone + +#Void Stone Pillars +tile.voidstonePillar.name=Void Stone Pillar +tile.voidstonePillar.0.desc=Striped Void Stone Pillar + +#Waterstone +tile.waterstone.name=Waterstone +tile.waterstone.0.desc=Waterstone Bricks +tile.waterstone.1.desc=Kraken Black Waterstone +tile.waterstone.2.desc=Waterstone Tiles +tile.waterstone.3.desc=Chaotic Waterstone Bricks +tile.waterstone.4.desc=Water Creeper in Tiles +tile.waterstone.5.desc=Water Panel +tile.waterstone.6.desc=Ornate Water Panel + +#Hex Plating +tile.hexPlating.name=Hex Plating +tile.hexPlating.0.desc=Kraken Black Plating +tile.hexPlating.1.desc=Ocean Blue Plating +tile.hexPlating.2.desc=Brown Plating +tile.hexPlating.3.desc=Cyan Plating +tile.hexPlating.4.desc=Green Plating +tile.hexPlating.5.desc=Light Ocean Blue Plating +tile.hexPlating.6.desc=Light Gray Plating +tile.hexPlating.7.desc=Lime Plating +tile.hexPlating.8.desc=Magenta Plating +tile.hexPlating.9.desc=Orange Plating +tile.hexPlating.10.desc=Pink Plating +tile.hexPlating.11.desc=Purple Plating +tile.hexPlating.12.desc=Blood Red Plating +tile.hexPlating.13.desc=White Plating +tile.hexPlating.14.desc=Yellow Plating +tile.hexPlating.15.desc=Gray Plating + +#Grimstone +tile.grimstone.name=Grimstone +tile.grimstone.0.desc=Grimstone +tile.grimstone.1.desc=Smooth Grimstone +tile.grimstone.2.desc=Mysterious Grimstone symbol +tile.grimstone.3.desc=Chiseled Grimstone +tile.grimstone.4.desc=Grimstone Blocks +tile.grimstone.5.desc=Rough Grimstone Bricks +tile.grimstone.6.desc=Grimstone Bricks +tile.grimstone.7.desc=Large Grimstone Bricks +tile.grimstone.8.desc=Grimstone Platform +tile.grimstone.9.desc=Grimstone Platform Tiles +tile.grimstone.10.desc=Swaggy Grimstone Construction +tile.grimstone.11.desc=Swaggy Grimstone Tiles +tile.grimstone.12.desc=Smooth Grimstone Plate +tile.grimstone.13.desc=Grimstone plate + +#Chisel 1 + +#Cobblestone Blocks +tile.cobblestone.name=Cobblestone +tile.cobblestone.0.desc=Aligned Cobblestone Bricks +tile.cobblestone.1.desc=Detailed Cobblestone Bricks +tile.cobblestone.2.desc=Small Cobblestone Bricks +tile.cobblestone.3.desc=Large Cobblestone Tiles +tile.cobblestone.4.desc=Small Cobblestone Tiles +tile.cobblestone.5.desc=French Cobblestone Tiles +tile.cobblestone.6.desc=French Cobblestone Tiles +tile.cobblestone.7.desc=Creeper Cobblestone Tiles +tile.cobblestone.8.desc=Damaged Cobblestone Tiles +tile.cobblestone.9.desc=Huge Cobblestone Tiles +tile.cobblestone.10.desc=Cobblestone wit' Creeper Panel +tile.cobblestone.11.desc=Cobblestone wit' Dent +tile.cobblestone.12.desc=Cobblestone wit' Panel +tile.cobblestone.13.desc=Cobblestone wit' Light Panel +tile.cobblestone.14.desc=Cobblestone wit' Dark Panel + +#Sandstone Blocks +tile.sandstone.name=Sandstone + +#Marble Blocks +tile.marble.name=Marble +tile.marble.0.desc=Raw Marble +tile.marble.1.desc=Marble Brick +tile.marble.2.desc=Classic Marble Panel +tile.marble.3.desc=Ornate Marble Panel +tile.marble.4.desc=Marble Panel +tile.marble.5.desc=Marble Block +tile.marble.6.desc=Dark Creeper Marble +tile.marble.7.desc=Light Creeper Marble +tile.marble.8.desc=Carved Marble +tile.marble.9.desc=Radial Carved Marble +tile.marble.10.desc=Marble wit' Dent +tile.marble.11.desc=Marble wit' Large Dent +tile.marble.12.desc=Marble Tiles +tile.marble.13.desc=Arranged Marble Tiles +tile.marble.14.desc=Swaggy Marble Tiles +tile.marble.15.desc=Marble Blocks + +#Marble Slabs +tile.marble_slab.name=Marble Slab +tile.marbleSlab.0.desc=Raw Marble Slab +tile.marbleSlab.1.desc=Marble Brick Slab +tile.marbleSlab.2.desc=Classic Marble Panel Slab +tile.marbleSlab.3.desc=Ornate Marble Panel Slab +tile.marbleSlab.4.desc=Marble Panel Slab +tile.marbleSlab.5.desc=Marble Block Slab +tile.marbleSlab.6.desc=Dark Creeper Marble Slab +tile.marbleSlab.7.desc=Light Creeper Marble Slab +tile.marbleSlab.8.desc=Carved Marble Slab +tile.marbleSlab.9.desc=Radial Carved Marble Slab +tile.marbleSlab.10.desc=Marble Slab wit' Dent +tile.marbleSlab.11.desc=Marble Slab wit' Large Dent +tile.marbleSlab.12.desc=Marble Tiled Slab +tile.marbleSlab.13.desc=Arranged Marble Tiled Slab +tile.marbleSlab.14.desc=Swaggy Marble Tiled Slab +tile.marbleSlab.15.desc=Marble Blocks Slab + +#Marble Pillars (old) +tile.marble_pillar.name=Marble Pillar +tile.marblePillarOld.0.desc=Marble Pillar +tile.marblePillarOld.1.desc=Marble Pillar Capstone +tile.marblePillarOld.2.desc=Marble Pillar Base +tile.marblePillarOld.3.desc=Small Marble Pillar +tile.marblePillarOld.4.desc=Carved Marble Pillar +tile.marblePillarOld.5.desc=Ornamental Marble Pillar +tile.marblePillarOld.6.desc=Greek Marble Pillar +tile.marblePillarOld.7.desc=Plain Marble Pillar +tile.marblePillarOld.8.desc=Greek Marble Pillar Capstone +tile.marblePillarOld.9.desc=Plain Marble Pillar Capstone +tile.marblePillarOld.10.desc=Greek Marble Pillar Base +tile.marblePillarOld.11.desc=Plain Marble Pillar Base +tile.marblePillarOld.12.desc=Greek Marble Pillar Ornate Capstone +tile.marblePillarOld.13.desc=Plain Marble Pillar Ornate Capstone +tile.marblePillarOld.14.desc=Greek Marble Pillar Ornate Base +tile.marblePillarOld.15.desc=Plain Marble Pillar Ornate Base + +#Marble Pillars (current) +tile.marblePillar.0.desc=Marble Pillar +tile.marblePillar.1.desc=Original Marble Pillar +tile.marblePillar.2.desc=Simplistic Marble Pillar +tile.marblePillar.3.desc=Convex Marble Pillar +tile.marblePillar.4.desc=Rough Marble Pillar +tile.marblePillar.5.desc=Greek Marble Pillar wit' Ornate Capstone +tile.marblePillar.6.desc=Greek Marble Pillar +tile.marblePillar.7.desc=Greek Marble Pillar wit' Plain Capstone +tile.marblePillar.8.desc=Plain Marble Pillar wit' Ornate Capstone +tile.marblePillar.9.desc=Plain Marble Pillar wit' Greek Capstone +tile.marblePillar.10.desc=Plain Marble Pillar +tile.marblePillar.11.desc=Wide Marble Pillar wit' Ornate Capstone +tile.marblePillar.12.desc=Wide Marble Pillar wit' Greek Capstone +tile.marblePillar.13.desc=Wide Marble Pillar wit' Plain Capstone +tile.marblePillar.14.desc=Carved Pillar Capstone +tile.marblePillar.15.desc=Ornamental Pillar Capstone + +#Marble Slabs (old) +tile.marble_pillar_slab.name=Marble Pillar Slab +tile.marblePillarSlabOld.0.desc=Marble Pillar Slab +tile.marblePillarSlabOld.1.desc=Marble Pllar Capstone Slab +tile.marblePillarSlabOld.2.desc=Marble Pillar Base Slab +tile.marblePillarSlabOld.3.desc=Small Marble Pillar Slab +tile.marblePillarSlabOld.4.desc=Carved Marble Pillar Slab +tile.marblePillarSlabOld.5.desc=Ornamental Marble Pillar Slab +tile.marblePillarSlabOld.6.desc=Greek Marble Pillar Slab +tile.marblePillarSlabOld.7.desc=Plain Marble Pillar Slab +tile.marblePillarSlabOld.8.desc=Greek Marble Pillar Capstone Slab +tile.marblePillarSlabOld.9.desc=Plain Marble Pillar capstone Slab +tile.marblePillarSlabOld.10.desc=Greek Marble Pillar Base Slab +tile.marblePillarSlabOld.11.desc=Plain Marble Pillar Base Slab +tile.marblePillarSlabOld.12.desc=Greek Marble Pillar Ornate Capstone Slab +tile.marblePillarSlabOld.13.desc=Plain Marble Pillar Ornate Capstone Slab +tile.marblePillarSlabOld.14.desc=Greek Marble Pillar Ornate Base Slab +tile.marblePillarSlabOld.15.desc=Plain Marble Pillar Ornate Base Slab + +#Marble Slabs (current) +tile.marblePillarSlab.0.desc=Marble Pillar Slab +tile.marblePillarSlab.1.desc=Original Marble Pillar Slab +tile.marblePillarSlab.2.desc=Simplistic Marble Pillar Slab +tile.marblePillarSlab.3.desc=Convex Marble Pillar Slab +tile.marblePillarSlab.4.desc=Rough Marble Pillar Slab +tile.marblePillarSlab.5.desc=Greek Marble Pillar Slab wit' Ornate Capstone +tile.marblePillarSlab.6.desc=Greek Marble Pillar Slab +tile.marblePillarSlab.7.desc=Greek Marble Pillar Slab wit' Plain Capstone +tile.marblePillarSlab.8.desc=Plain Marble Pillar Slab wit' Ornate Capstone +tile.marblePillarSlab.9.desc=Plain Marble Pillar Slab wit' Greek Capstone +tile.marblePillarSlab.10.desc=Plain Marble Pillar Slab +tile.marblePillarSlab.11.desc=Wide Marble Pillar Slab wit' Ornate Capstone +tile.marblePillarSlab.12.desc=Wide Marble Pillar Slab wit' Greek Capstone +tile.marblePillarSlab.13.desc=Wide Marble Pillar Slab wit' Plain Capstone +tile.marblePillarSlab.14.desc=Carved Pillar Capstone Slab +tile.marblePillarSlab.15.desc=Ornamental Pillar Capstone Slab + +#Marble Stairs +#The same name goes here 8 different times since stairs take up 8 block positions. +#Sorry! It was the only way! +tile.marble_stairs.0.name=Marble Stairs +tile.marble_stairs.1.name=Marble Stairs +tile.marble_stairs.2.name=Marble Stairs +tile.marble_stairs.3.name=Marble Stairs +tile.marble_stairs.4.name=Marble Stairs +tile.marble_stairs.5.name=Marble Stairs +tile.marble_stairs.6.name=Marble Stairs +tile.marble_stairs.7.name=Marble Stairs + +#These are bugged.... so sad :,( +tile.marbleStairs.0.desc=Raw Marble Stairs +tile.marbleStairs.1.desc=Marble Brick Stairs +tile.marbleStairs.2.desc=Classic Marble Panel Stairs +tile.marbleStairs.3.desc=Ornate Marble Panel Stairs +tile.marbleStairs.4.desc=Marble Panel Stairs +tile.marbleStairs.5.desc=Marble Block Stairs +tile.marbleStairs.6.desc=Dark Creeper Marble Stairs +tile.marbleStairs.7.desc=Light Creeper Marble Stairs +tile.marbleStairs.8.desc=Carved Marble Stairs +tile.marbleStairs.9.desc=Radial Carved Marble Stairs +tile.marbleStairs.10.desc=Marble Stairs wit' Dent +tile.marbleStairs.11.desc=Marble Stairs wit' Large Dent +tile.marbleStairs.12.desc=Marble Tiled Stairs +tile.marbleStairs.13.desc=Arranged Marble Tiled Stairs +tile.marbleStairs.14.desc=Swaggy Marble Tiled Stairs +tile.marbleStairs.15.desc=Marble Block Stairs + +#Limestone +tile.limestone.name=Limestone +tile.limestone.0.desc=Limestone +tile.limestone.1.desc=Small Limestone Tiles +tile.limestone.2.desc=French Limestone Tiles +tile.limestone.3.desc=French Limestone Tiles +tile.limestone.4.desc=Creeper Limestone Tiles +tile.limestone.5.desc=Small Limestone Bricks +tile.limestone.6.desc=Damaged Limestone Tiles +tile.limestone.7.desc=Smooth Limestone +tile.limestone.8.desc=Limestone wit' Ornate Panel +tile.limestone.9.desc=Limestone wit' Ornate Panel +tile.limestone.10.desc=Limestone wit' Creeper Panel +tile.limestone.11.desc=Limestone wit' Dent +tile.limestone.12.desc=Limestone wit' Panel +tile.limestone.13.desc=Large Limestone Tiles +tile.limestone.14.desc=Limestone wit' Light Panel +tile.limestone.15.desc=Limestone wit' Dark Panel + +#Limestone Slabs +tile.limestone_slab.name=Limestone Slab +tile.limestoneSlab.0.desc=Limestone Slab +tile.limestoneSlab.1.desc=Small Limestone Tiled Slab +tile.limestoneSlab.2.desc=French Limestone Tiled Slab +tile.limestoneSlab.3.desc=French Limestone Tiled Slab +tile.limestoneSlab.4.desc=Creeper Limestone Tiled Slab +tile.limestoneSlab.5.desc=Small Limestone Bricks Slab +tile.limestoneSlab.6.desc=Damaged Limestone Tiled Slab +tile.limestoneSlab.7.desc=Smooth Limestone Slab +tile.limestoneSlab.8.desc=Limestone Slab wit' Ornate Panel +tile.limestoneSlab.9.desc=Limestone Slab wit' Ornate Panel +tile.limestoneSlab.10.desc=Limestone Slab wit' Creeper Panel +tile.limestoneSlab.11.desc=Limestone Slab wit' Dent +tile.limestoneSlab.12.desc=Limestone Slab wit' Panel +tile.limestoneSlab.13.desc=Large Limestone Tiles Slab +tile.limestoneSlab.14.desc=Limestone Slab wit' Light Panel +tile.limestoneSlab.15.desc=Limestone Slab wit' Dark Panel + +#Limestone Stairs +#The same name goes here 8 different times since stairs take up 8 block positions. +#Sorry! It was the only way! +tile.limestone_stairs.0.name=Limestone Stairs +tile.limestone_stairs.1.name=Limestone Stairs +tile.limestone_stairs.2.name=Limestone Stairs +tile.limestone_stairs.3.name=Limestone Stairs +tile.limestone_stairs.4.name=Limestone Stairs +tile.limestone_stairs.5.name=Limestone Stairs +tile.limestone_stairs.6.name=Limestone Stairs +tile.limestone_stairs.7.name=Limestone Stairs + +#These are bugged.... so sad :,( +tile.limestoneStairs.0.desc=Limestone Stairs +tile.limestoneStairs.1.desc=Small Limestone Tiled Stairs +tile.limestoneStairs.2.desc=French Limestone Tiled Stairs +tile.limestoneStairs.3.desc=French Limestone Tiled Stairs +tile.limestoneStairs.4.desc=Creeper Limestone Tiled Stairs +tile.limestoneStairs.5.desc=Small Limestone Bricks Stairs +tile.limestoneStairs.6.desc=Damaged Limestone Tiled Stairs +tile.limestoneStairs.7.desc=Smooth Limestone Stairs +tile.limestoneStairs.8.desc=Limestone Stairs wit' Ornate Panel +tile.limestoneStairs.9.desc=Limestone Stairs wit' Ornate Panel +tile.limestoneStairs.10.desc=Limestone Stairs wit' Creeper Panel +tile.limestoneStairs.11.desc=Limestone Stairs wit' Dent +tile.limestoneStairs.12.desc=Limestone Stairs wit' Panel +tile.limestoneStairs.13.desc=Large Limestone Tiled Stairs +tile.limestoneStairs.14.desc=Limestone Stairs wit' Light Panel +tile.limestoneStairs.15.desc=Limestone Stairs wit' Dark Panel + +#Factory Blocks +tile.factoryblock.name=Factory Block +tile.factory.0.desc=Rusty Metal Plate wit' Dotted Pattern +tile.factory.1.desc=Rusty Metal Plate +tile.factory.2.desc=Very Rusty Metal Plate +tile.factory.3.desc=A Metal Plate wit' Little Rust +tile.factory.4.desc=Wireframe +tile.factory.5.desc=Wireframe in a Shade of Purple +tile.factory.6.desc=Yellow-Kraken Black Hazard Block +tile.factory.7.desc=Orange-White Hazard Block +tile.factory.8.desc=Swaggy Circuit Block +tile.factory.9.desc=Swaggy Metal Box +tile.factory.10.desc=Swaggy Circuit Block wit' Booty Plating +tile.factory.11.desc=Rusty Purple Block wit' Booty Plating +tile.factory.12.desc=Shiny Metal Construction Block +tile.factory.13.desc=WeaBlood Red Metal Wall wit' Openings for Ventilation +tile.factory.14.desc=Rusty Metal Plates +tile.factory.15.desc=WeaBlood Red Metal Column + +#Diamond blocks +tile.diamond_block.name=Diamond Block +tile.diamond.1.desc=Embossed Diamond Block +tile.diamond.2.desc=Diamond Block wit' Panel +tile.diamond.3.desc=Diamond Cells +tile.diamond.4.desc=Diamonds in Purple Obsidian +tile.diamond.5.desc=Diamonds in Obsidian +tile.diamond.6.desc=Simple Diamond Block +tile.diamond.7.desc=Bismuth +tile.diamond.8.desc=Crushed Diamond +tile.diamond.9.desc=Small Diamond Blocks +tile.diamond.10.desc=Small Ornate Diamond Blocks +tile.diamond.11.desc=Zelda Diamond Block +tile.diamond.12.desc=Diamond Block wit' Ornate Layer + +#Snakestone +tile.snakestoneSand.name=Sand Snakestone +tile.snakestoneStone.name=Stone Snakestone +tile.obsidianSnakestone.name=Obsidian Snakestone + +#Glass blocks +tile.glass.name=Glass +tile.glass.1.desc=Bubble Glass +tile.glass.2.desc=Chinese Glass +tile.glass.3.desc=Japanese(?) Glass +tile.glass.4.desc=Dungeon Glass +tile.glass.5.desc=Light Glass +tile.glass.6.desc=Borderless Glass +tile.glass.7.desc=Ornate Steel Glass +tile.glass.8.desc=Screen +tile.glass.9.desc=Shale Glass +tile.glass.10.desc=Steel Frame Glass +tile.glass.11.desc=Stone Frame Glass +tile.glass.12.desc=Streak Glass +tile.glass.13.desc=Thick Grid Glass +tile.glass.14.desc=Thin Grid Glass +tile.glass.15.desc=Modern Iron Fence + +#Sandstone +tile.sandstone.name=Sandstone +tile.sandstone.3.desc=Faded Sandstone +tile.sandstone.4.desc=Sandstone Pillar +tile.sandstone.5.desc=Sandstone Pillar Capstone +tile.sandstone.6.desc=Small Sandstone Pillar +tile.sandstone.7.desc=Sandstone Pillar Base +tile.sandstone.8.desc=Smooth & Flat Sandstone +tile.sandstone.9.desc=Smooth Sandstone Pillar Capstone +tile.sandstone.10.desc=Small Smooth Sandstone Pillar +tile.sandstone.11.desc=Smooth Sandstone Pillar Base +tile.sandstone.12.desc=Sandstone Block +tile.sandstone.13.desc=Small Sandstone Blocks +tile.sandstone.14.desc=Sandstone Mosaic +tile.sandstone.15.desc=Stacked Sandstone Tiles + +#Sandstone scribbles +tile.sandstone_scribbles.name=Sandstone Scribbles +tile.sandstoneScribbles.desc=Sandstone Scribbles + +#Concrete +tile.concrete.name=Concrete +tile.concrete.0.desc=Concrete +tile.concrete.1.desc=Concrete Block +tile.concrete.2.desc=Concrete Double Slab +tile.concrete.3.desc=Small Concrete Blocks +tile.concrete.4.desc=WeatheBlood Red Concrete +tile.concrete.5.desc=WeatheBlood Red Concrete Block +tile.concrete.6.desc=WeatheBlood Red Concrete Double Slab +tile.concrete.7.desc=Small WeatheBlood Red Blocks +tile.concrete.8.desc=Partly WeatheBlood Red Concrete +tile.concrete.9.desc=Partly WeatheBlood Red Concrete Block +tile.concrete.10.desc=Asphalt + +#Road Line +tile.roadLine.name=Road Lines + +#Iron Blocks +tile.iron_block.name=Iron Block +tile.iron.1.desc=Large Iron Ingots +tile.iron.2.desc=Small Iron Ingots +tile.iron.3.desc=Iron Gears +tile.iron.4.desc=Iron Bricks +tile.iron.5.desc=Iron Plates +tile.iron.6.desc=Iron Plates wit' Rivets +tile.iron.7.desc=Iron Coin Stack Heads-up +tile.iron.8.desc=Iron Coin Stack Heads-down +tile.iron.9.desc=Dark Iron Crate +tile.iron.10.desc=Light Iron Crate +tile.iron.11.desc=Iron Block wit' Moon Decoration +tile.iron.12.desc=Iron Moon in Purple Obsidian +tile.iron.13.desc=Iron Moon in Obsidian +tile.iron.14.desc=Iron Vents +tile.iron.15.desc=Simple Iron Block + +#Booty Blocks +tile.Booty_block.name=Booty Block +tile.Booty.1.desc=Large Bootyen Ingots +tile.Booty.2.desc=Small Bootyen Ingots +tile.Booty.3.desc=Bootyen Bricks +tile.Booty.4.desc=Booty Cart +tile.Booty.5.desc=Bootyen Coin Stack Heads-up +tile.Booty.6.desc=Bootyen Coin Stack Heads-down +tile.Booty.7.desc=Dark Booty Crate +tile.Booty.8.desc=Light Booty Crate +tile.Booty.9.desc=Bootyen Plates +tile.Booty.10.desc=Booty Plates wit' Rivets +tile.Booty.11.desc=Booty Block wit' Star Decoration +tile.Booty.12.desc=Bootyen Star in Purple Obsidian +tile.Booty.13.desc=Bootyen Star in Obsidian +tile.Booty.14.desc=Simple Booty Block + +#Glowstone +tile.glowstone.name=Glowstone +tile.lightstone.1.desc=Cobble Glowstone Block +tile.lightstone.2.desc=Corroded Glowstone Blocks +tile.lightstone.3.desc=Glowstone Blocks wit' Glass +tile.lightstone.4.desc=Neon Glowstone +tile.lightstone.5.desc=Ornate Glowstone Blocks +tile.lightstone.6.desc=Rocky Glowstone +tile.lightstone.7.desc=Shale-Shaped Glowstone +tile.lightstone.8.desc=Glowstone Tiles +tile.lightstone.9.desc=Swaggy Glowstone Lantern +tile.lightstone.10.desc=Crumbling Glowstone Block +tile.lightstone.11.desc=Organic Glowstone Growth Block +tile.lightstone.12.desc=Glowstone Layers +tile.lightstone.13.desc=Corroded Glowstone Tiles +tile.lightstone.14.desc=Glowstone Bismuth +tile.lightstone.15.desc=Glowstone Bismuth Panel + +#Lapis blocks +tile.lapis_block.name=Lapis Block +tile.lapis.1.desc=Chunky Lapis Block +tile.lapis.2.desc=Dark Lapis Block +tile.lapis.3.desc=Zelda Lapis Block +tile.lapis.4.desc=Ornate Lapis Block +tile.lapis.5.desc=Lapis Tile +tile.lapis.6.desc=Lapis Panel +tile.lapis.7.desc=Smooth Lapis +tile.lapis.8.desc=Lapis wit' Ornate Layer + +#Emerald Blocks +tile.emerald_block.name=Emerald Block +tile.emerald.1.desc=Emerald Panel +tile.emerald.2.desc=Classic emerald Panel +tile.emerald.3.desc=Smooth Emerald +tile.emerald.4.desc=Emerald Chunk +tile.emerald.5.desc=Emerald wit' Ornate Layer +tile.emerald.6.desc=Zelda Emerald Block +tile.emerald.7.desc=Emerald Cell +tile.emerald.8.desc=Emerald Bismuth +tile.emerald.9.desc=Small Emerald Blocks +tile.emerald.10.desc=Small Ornate Emerald Blocks +tile.emerald.11.desc=Ornate Emerald Block + +#Nether Brick +tile.nether_brick.name=Nether Brick +tile.netherBrick.1.desc=Ocean Blue Nether Brick +tile.netherBrick.2.desc=SpatteBlood Red Nether Brick +tile.netherBrick.3.desc=Nether Brick made of Guts +tile.netherBrick.4.desc=Dark Nether Brick made of Guts +tile.netherBrick.5.desc=Small Nether Brick made of Guts +tile.netherBrick.6.desc=Ocean Blue Nether Brick wit' Lava +tile.netherBrick.7.desc=Brown Nether Brick +tile.netherBrick.8.desc=Obsidian Nether Brick +tile.netherBrick.9.desc=Stone Nether Brick +tile.netherBrick.10.desc=Nether Brick made of Meat +tile.netherBrick.11.desc=Blood Red Nether Brick made of Meat +tile.netherBrick.12.desc=Small Nether Brick made of Meat +tile.netherBrick.13.desc=Small Blood Red Nether Brick made of Meat +tile.netherBrick.14.desc=Blood Red Nether Brick +tile.netherBrick.15.desc=Small Blood Red Nether Brick + +#Netherrack +tile.netherrack.name=Netherrack +tile.hellrock.1.desc=Nethergravel wit' Blood +tile.hellrock.2.desc=Netherrack wit' Blood +tile.hellrock.3.desc=Darker Netherrack wit' Blood +tile.hellrock.4.desc=Ocean Blue Netherrack +tile.hellrock.5.desc=Shale Ocean Blue Netherrack +tile.hellrock.6.desc=Classic Netherrack +tile.hellrock.7.desc=SpatteBlood Red Netherrack +tile.hellrock.8.desc=Netherrack made of Guts +tile.hellrock.9.desc=Dark Netherrack made of Guts +tile.hellrock.10.desc=Netherrack made of Meat +tile.hellrock.11.desc=Blood Red Netherrack made of Meat +tile.hellrock.12.desc=Netherrack made of Smaller Meat Chunks +tile.hellrock.13.desc=Dark Blood Red Netherrack +tile.hellrock.14.desc=Netherrack wit' Flowing Lava + +#Mossy Stone +tile.mossy_cobblestone.name=Mossy Cobblestone +tile.stoneMoss.1.desc=Aligned Mossy Cobblestone Bricks +tile.stoneMoss.2.desc=Detailed Mossy Cobblestone Bricks +tile.stoneMoss.3.desc=Small Mossy Cobblestone Bricks +tile.stoneMoss.4.desc=Large Mossy Cobblestone Tiles +tile.stoneMoss.5.desc=Small Mossy Cobblestone Tiles +tile.stoneMoss.6.desc=French Mossy Cobblestone Tiles +tile.stoneMoss.7.desc=French Mossy Cobblestone Tiles +tile.stoneMoss.8.desc=Creeper Mossy Cobblestone Tiles +tile.stoneMoss.9.desc=Damaged Mossy Cobblestone Tiles +tile.stoneMoss.10.desc=Huge Mossy Cobblestone Tiles +tile.stoneMoss.11.desc=Mossy Cobblestone wit' Creeper Panel +tile.stoneMoss.12.desc=Mossy Cobblestone wit' Dent +tile.stoneMoss.13.desc=Mossy Cobblestone wit' Pane +tile.stoneMoss.14.desc=Mossy Cobblestone wit' Light Panel +tile.stoneMoss.15.desc=Mossy Cobblestone wit' Dark Panel + +#Stone Bricks +tile.stoneBrick.name=Stone Bricks +tile.stoneBrick.4.desc=Small Stone Bricks +tile.stoneBrick.5.desc=Wide Stone Bricks +tile.stoneBrick.6.desc=Small DisordeBlood Red Stone Bricks +tile.stoneBrick.7.desc=DisordeBlood Red Stone Bricks +tile.stoneBrick.8.desc=DisordeBlood Red Stone Panels +tile.stoneBrick.9.desc=Stone Bricks in a Swaggy Arrangement +tile.stoneBrick.10.desc=Ornate Stone Brick tiles +tile.stoneBrick.11.desc=Large Ornate Stone Brick Tiles +tile.stoneBrick.12.desc=Stone Panel +tile.stoneBrick.13.desc=Sunken Stone Panel +tile.stoneBrick.14.desc=Ornate Stone Panel +tile.stoneBrick.15.desc=Poison Stone Brick + +#Dirt +tile.dirt.name=Dirt +tile.dirt.0.desc=Dirt Bricks in Disarray +tile.dirt.1.desc=Dirt Bricks Imitating Nether Brick Design +tile.dirt.2.desc=Dirt Bricks +tile.dirt.3.desc=Cobble-Dirt +tile.dirt.4.desc=Reinforced Cobble-Dirt +tile.dirt.5.desc=Reinforced Dirt +tile.dirt.6.desc=Happy Dirt +tile.dirt.7.desc=Large Dirt Bricks +tile.dirt.8.desc=Large Dirt Bricks on top of Dirt +tile.dirt.9.desc=Horizontal Dirt +tile.dirt.10.desc=Vertical Dirt +tile.dirt.11.desc=Dirt Layers +tile.dirt.12.desc=Crumbling Dirt + +#Ice +tile.ice.name=Ice +tile.ice.1.desc=Rough Ice Block +tile.ice.2.desc=Cobble-ice +tile.ice.3.desc=Large Rough Ice Bricks +tile.ice.4.desc=Large Ice Bricks +tile.ice.5.desc=Small Ice Bricks +tile.ice.6.desc=Swaggy Glass Wall +tile.ice.7.desc=Large Ice Tiles +tile.ice.8.desc=Swaggy Ice Tiles +tile.ice.9.desc=Sunken Ice Tiles +tile.ice.10.desc=DisordeBlood Red Ice Tiles +tile.ice.11.desc=Ice Panel +tile.ice.12.desc=Ice Double Slab +tile.ice.13.desc=Ice Zelda Block +tile.ice.14.desc=Ice Bismuth Block +tile.ice.15.desc=Ice Poison Block + +#Ice Pillars +tile.ice_pillar.name=Ice Pillar +tile.icePillar.0.desc=Ice Pillar +tile.icePillar.1.desc=Ice Pillar Capstone +tile.icePillar.2.desc=Ice Pillar Base +tile.icePillar.3.desc=Small Ice Pillar +tile.icePillar.4.desc=Carved Ice Pillar +tile.icePillar.5.desc=Ornamental Ice Pillar +tile.icePillar.6.desc=Greek Ice Pillar +tile.icePillar.7.desc=Plain Ice Pillar +tile.icePillar.8.desc=Greek Ice Pillar Capstone +tile.icePillar.9.desc=Plain Ice Pillar Capstone +tile.icePillar.10.desc=Greek Ice Pillar Base +tile.icePillar.11.desc=Plain Ice Pillar Base +tile.icePillar.12.desc=Greek Ice Pillar Ornate Capstone +tile.icePillar.13.desc=Plain Ice Pillar Ornate Capstone +tile.icePillar.14.desc=Greek Ice Pillar Ornate Base +tile.icePillar.15.desc=Plain Ice Pillar Ornate Base + +#Ice Stairs +tile.ice_stairs.name=Ice Stairs +tile.ice_stairs.0.name=Ice Stairs +tile.ice_stairs.1.name=Ice Stairs +tile.ice_stairs.2.name=Ice Stairs +tile.ice_stairs.3.name=Ice Stairs +tile.ice_stairs.4.name=Ice Stairs +tile.ice_stairs.5.name=Ice Stairs +tile.ice_stairs.6.name=Ice Stairs +tile.ice_stairs.7.name=Ice Stairs +tile.iceStairs.0.desc=Ice Stairs +tile.iceStairs.1.desc=Rough Ice Stairs +tile.iceStairs.2.desc=Cobble-Ice Stairs +tile.iceStairs.3.desc=Large rough Ice Brick Stairs +tile.iceStairs.4.desc=Large Ice Brick Stairs +tile.iceStairs.5.desc=Small Ice Brick Stairs +tile.iceStairs.6.desc=Swaggy Ice Wall Stairs +tile.iceStairs.7.desc=Large Ice Tile Stairs +tile.iceStairs.8.desc=Swaggy Ice Tile Stairs +tile.iceStairs.9.desc=Sunken Ice Tile Stairs +tile.iceStairs.10.desc=DisordeBlood Red Ice Tile Stairs +tile.iceStairs.11.desc=Ice Panel Stairs +tile.iceStairs.12.desc=Ice Double Slab Stairs +tile.iceStairs.13.desc=Ice Zelda Stairs +tile.iceStairs.14.desc=Ice Bismuth Stairs +tile.iceStairs.15.desc=Ice Poison Stairs + +#Obsidian +tile.obsidian.name=Obsidian +tile.obsidian.1.desc=Large Obsidian Pillar +tile.obsidian.2.desc=Obsidian Pillar +tile.obsidian.3.desc=Chiseled Obsidian +tile.obsidian.4.desc=Shiny Obsidian Panel +tile.obsidian.5.desc=Obsidian Panel +tile.obsidian.6.desc=Organic-Looking Obsidian Chunks +tile.obsidian.7.desc=Organic-Looking Obsidian Growth +tile.obsidian.8.desc=Obsidian Crystal +tile.obsidian.9.desc=Obsidian Panel wit' Map +tile.obsidian.10.desc=Obsidian Panel wit' Region Map +tile.obsidian.11.desc=Bright Obsidian Panel +tile.obsidian.12.desc=Obsidian Blocks +tile.obsidian.13.desc=Obsidian Tiles +tile.obsidian.14.desc=Light Obsidian Blocks wit' Greek Decor +tile.obsidian.15.desc=Small Obsidian Blocks inside an Oak Wood Crate + +#Wood +tile.oak_planks.name=Oak Wood +tile.birch_planks.name=Birch Wood +tile.spruce_planks.name=Spruce Wood +tile.jungle_planks.name=Jungle Wood +tile.dark_oak_planks.name=Dark Oak Wood +tile.acacia_planks.name=Acacia Wood + +#Remember to do the descriptions. + +#Iron Fence +tile.iron_bars.name=Iron Bars +tile.iron_bars.1.desc=Iron Bars wit'out Frame +tile.iron_bars.2.desc=Menacing Iron Bars +tile.iron_bars.3.desc=Iron Cage Bars +tile.iron_bars.4.desc=Menacing Iron Spikes +tile.iron_bars.5.desc=Thick Iron Grid +tile.iron_bars.6.desc=Thin Iron Grid +tile.iron_bars.7.desc=Ornate Iron Pane Fence +tile.iron_bars.8.desc=Vertical Iron Bars +tile.iron_bars.9.desc=Iron spikes + +#Glass Panes +tile.glass_pane.name=Glass Pane +tile.glass_pane.1.desc=Bubble Glass Pane +tile.glass_pane.2.desc=Borderless Glass Pane +tile.glass_pane.3.desc=Screen Pane +tile.glass_pane.4.desc=Streak Glass Pane +tile.glass_pane.12.desc=Chinese Glass Pane +tile.glass_pane.13.desc=Chinese Glass Pane wit' Bootyen Grame +tile.glass_pane.14.desc=Japanese Glass Pane +tile.glass_pane.15.desc=Ornate Japanese Glass Pane + +#Magic Dust block +tile.redstone_block.name=Magic Dust Block +tile.redstone_block.1.desc=Smooth Magic Dust +tile.redstone_block.2.desc=Large Magic Dust Block +tile.redstone_block.3.desc=Small Magic Dust Block +tile.redstone_block.4.desc=Magic Dust Bricks +tile.redstone_block.5.desc=Small Magic Dust Bricks +tile.redstone_block.6.desc=Chaotic Magic Dust Bricks +tile.redstone_block.7.desc=Chiseled Magic Dust +tile.redstone_block.8.desc=Magic Dust Greek Decoration +tile.redstone_block.9.desc=Ornate Magic Dust Tiles +tile.redstone_block.10.desc=Magic Dust Pillar +tile.redstone_block.11.desc=Magic Dust Tiles +tile.redstone_block.12.desc=Magic Dust Circuit +tile.redstone_block.13.desc=Magic Dust Supaplex Circuit +tile.redstone_block.14.desc=Magic Dust Skulls +tile.redstone_block.15.desc=Magic Dust Zelda Block + +#Holystone +tile.holystone.name=Holystone +tile.holystone.0.desc=Holystone +tile.holystone.1.desc=Smooth Holystone +tile.holystone.2.desc=Mysterious Holystone Symbol +tile.holystone.3.desc=Chiseled Holystone +tile.holystone.4.desc=Holystone Blocks +tile.holystone.5.desc=Rough Holystone Bricks +tile.holystone.6.desc=Holystone Bricks +tile.holystone.7.desc=Large Holystone Bricks +tile.holystone.8.desc=Holystone Platform +tile.holystone.9.desc=Holystone Platform Tiles +tile.holystone.10.desc=Swaggy Holystone Construction +tile.holystone.11.desc=Swaggy Holystone Tiles +tile.holystone.12.desc=Smooth Holystone Plate +tile.holystone.13.desc=Holystone Plate + +#Lavastone +tile.lavastone.name=Lavastone +tile.lavastone.0.desc=Lavastone +tile.lavastone.1.desc=Kraken Black Lavastone +tile.lavastone.2.desc=Lavastone Tiles +tile.lavastone.3.desc=Chaotic Lavastone Bricks +tile.lavastone.4.desc=Lava Creeper in Tiles +tile.lavastone.5.desc=Lava Panel +tile.lavastone.6.desc=Ornate Lava Panel +tile.lavastone.7.desc=Dark Lavastone + +#Carpet +tile.carpet_block.name=Sailcloth +tile.carpet_block.0.desc=White Sailcloth Block +tile.carpet_block.1.desc=Orange Sailcloth Block +tile.carpet_block.2.desc=Magenta Sailcloth Block +tile.carpet_block.3.desc=Light Ocean Blue Sailcloth Block +tile.carpet_block.4.desc=Yellow Sailcloth Block +tile.carpet_block.5.desc=Light Green Sailcloth Block +tile.carpet_block.6.desc=Pink Sailcloth Block +tile.carpet_block.7.desc=Dark Grey Sailcloth Block +tile.carpet_block.8.desc=Grey Sailcloth Block +tile.carpet_block.9.desc=Teal Sailcloth Block +tile.carpet_block.10.desc=Purple Sailcloth Block +tile.carpet_block.11.desc=Dark Ocean Blue Sailcloth Block +tile.carpet_block.12.desc=Brown Sailcloth Block +tile.carpet_block.13.desc=Green Sailcloth Block +tile.carpet_block.14.desc=Blood Red Sailcloth Block +tile.carpet_block.15.desc=Kraken Black Sailcloth Block + +#Carpet floor +tile.carpet.name=Floor Carpet +tile.carpet.0.desc=White Carpet +tile.carpet.1.desc=Orange Carpet +tile.carpet.2.desc=Magenta Carpet +tile.carpet.3.desc=Light Ocean Blue Carpet +tile.carpet.4.desc=Yellow Carpet +tile.carpet.5.desc=Light Green Carpet +tile.carpet.6.desc=Pink Carpet +tile.carpet.7.desc=Dark Grey Carpet +tile.carpet.8.desc=Grey Carpet +tile.carpet.9.desc=Teal Carpet +tile.carpet.10.desc=Purple Carpet +tile.carpet.11.desc=Dark Ocean Blue Carpet +tile.carpet.12.desc=Brown Carpet +tile.carpet.13.desc=Green Carpet +tile.carpet.14.desc=Blood Blood Red Carpet +tile.carpet.15.desc=Kraken Black Carpet + +#Bookshelf +tile.bookshelf.name=Bookshelf +tile.bookshelf.1.desc=Bookshelf wit' rainbow coloured books +tile.bookshelf.2.desc=Necromancer Novice's Bookshelf +tile.bookshelf.3.desc=Necromancer's Bookshelf +tile.bookshelf.4.desc=Bookshelf wit' Blood Red tomes +tile.bookshelf.5.desc=Abandoned Bookshelf +tile.bookshelf.6.desc=Hoarder's Bookshelf +tile.bookshelf.7.desc=Bookshelf filled to the brim wit' boring pastel books +tile.bookshelf.8.desc=Historian's Bookshelf + +#Tyrian +tile.tyrian.name=Tyrian +tile.tyrian.0.desc=Futuristic Armor Plating Block +tile.tyrian.1.desc=Bleak Futuristic Armor Plating Block +tile.tyrian.2.desc=Purple Futuristic Armor Plating Block +tile.tyrian.3.desc=Faded purple Futuristic Armor Plating Block +tile.tyrian.4.desc=Rusted Futuristic Armor Plating Block +tile.tyrian.5.desc=Elaborate Futuristic Armor Plating Block +tile.tyrian.6.desc=Futuristic Armor Plating Block wit' many seams +tile.tyrian.7.desc=Futuristic platform block +tile.tyrian.8.desc=Futuristic armor plating tiles +tile.tyrian.9.desc=Diagonal Futuristic Armor Plating Block +tile.tyrian.10.desc=Futuristic Armor Plating Block wit' dent +tile.tyrian.11.desc=Ocean Blue Futuristic Armor Plating Block +tile.tyrian.12.desc=Kraken Black Futuristic Armor Plating Block +tile.tyrian.13.desc=Kraken Black futuristic armor plating tiles +tile.tyrian.14.desc=Kraken Black Futuristic Armor Plating Block wit' an opening +tile.tyrian.15.desc=Futuristic armor plating wit' shining metal bits + +#Temple +tile.templeblock.name=Temple Block +tile.templeblock.0.desc=Temple Cobblestone +tile.templeblock.1.desc=Oranate Temple Block +tile.templeblock.2.desc=Temple Plate +tile.templeblock.3.desc=Cracked Temple Plate +tile.templeblock.4.desc=Temple Bricks +tile.templeblock.5.desc=Large Temple Bricks +tile.templeblock.6.desc=WeaBlood Red Temple Bricks +tile.templeblock.7.desc=Temple Bricks in disarray +tile.templeblock.8.desc=Temple Column +tile.templeblock.9.desc=Temple Stand +tile.templeblock.10.desc=Temple Mosaic Stand +tile.templeblock.11.desc=Temple Creeper Stand +tile.templeblock.12.desc=Temple Tiles +tile.templeblock.13.desc=Small Temple Tiles +tile.templeblock.14.desc=Light Temple Tiles +tile.templeblock.15.desc=Small Light Temple Tiles + +#Temple Mossy +tile.mossy_templeblock.name=Mossy Temple Block +tile.mossy_templeblock.0.desc=Mossy Temple Cobblestone +tile.mossy_templeblock.1.desc=Oranate Mossy Temple Block +tile.mossy_templeblock.2.desc=Mossy Temple Plate +tile.mossy_templeblock.3.desc=Cracked Mossy Temple Plate +tile.mossy_templeblock.4.desc=Mossy Temple Bricks +tile.mossy_templeblock.5.desc=Large Mossy Temple Bricks +tile.mossy_templeblock.6.desc=WeaBlood Red Mossy Temple Bricks +tile.mossy_templeblock.7.desc=Mossy Temple bricks in disarray +tile.mossy_templeblock.8.desc=Mossy Temple Column +tile.mossy_templeblock.9.desc=Mossy Temple Stand +tile.mossy_templeblock.10.desc=Mossy Temple Mosaic Stand +tile.mossy_templeblock.11.desc=Mossy Temple Creeper Stand +tile.mossy_templeblock.12.desc=Mossy Temple Tiles +tile.mossy_templeblock.13.desc=Small Mossy Temple Tiles +tile.mossy_templeblock.14.desc=Light Mossy Temple Tiles +tile.mossy_templeblock.15.desc=Small Light Mossy Temple Tiles + +#Cloud +tile.cloud.name=Cloud +tile.cloud.0.desc=Cloud block + +#Stained glass T.T +tile.stained_glass_white.name=Stained Glass +tile.stained_glass_orange.name=Stained Glass +tile.stained_glass_magenta.name=Stained Glass +tile.stained_glass_lightOcean Blue.name=Stained Glass +tile.stained_glass_yellow.name=Stained Glass +tile.stained_glass_lime.name=Stained Glass +tile.stained_glass_pink.name=Stained Glass +tile.stained_glass_gray.name=Stained Glass +tile.stained_glass_lightgray.name=Stained Glass +tile.stained_glass_cyan.name=Stained Glass +tile.stained_glass_purple.name=Stained Glass +tile.stained_glass_Ocean Blue.name=Stained Glass +tile.stained_glass_brown.name=Stained Glass +tile.stained_glass_green.name=Stained Glass +tile.stained_glass_Blood Red.name=Stained Glass +tile.stained_glass_Kraken Black.name=Stained Glass + +#Stained GlassPane T.T +tile.stained_glass_pane_white.name=Stained Glass Pane +tile.stained_glass_pane_orange.name=Stained Glass Pane +tile.stained_glass_pane_magenta.name=Stained Glass Pane +tile.stained_glass_pane_lightOcean Blue.name=Stained Glass Pane +tile.stained_glass_pane_yellow.name=Stained Glass Pane +tile.stained_glass_pane_lime.name=Stained Glass Pane +tile.stained_glass_pane_pink.name=Stained Glass Pane +tile.stained_glass_pane_gray.name=Stained Glass Pane +tile.stained_glass_pane_lightgray.name=Stained Glass Pane +tile.stained_glass_pane_cyan.name=Stained Glass Pane +tile.stained_glass_pane_purple.name=Stained Glass Pane +tile.stained_glass_pane_Ocean Blue.name=Stained Glass Pane +tile.stained_glass_pane_brown.name=Stained Glass Pane +tile.stained_glass_pane_green.name=Stained Glass Pane +tile.stained_glass_pane_Blood Red.name=Stained Glass Pane +tile.stained_glass_pane_Kraken Black.name=Stained Glass Pane + +#Fantasy block +tile.fantasyblock.name=Purpled Fantasy Block +tile.fantasyblock.0.desc=Purpled Fantasy Brick +tile.fantasyblock.1.desc=Purpled Faded Fantasy Brick +tile.fantasyblock.2.desc=Purpled Worn Fantasy Brick +tile.fantasyblock.3.desc=Purpled Damaged Fantasy Bricks +tile.fantasyblock.4.desc=Purpled Fantasy Decoration +tile.fantasyblock.5.desc=Purpled Fantasy Decoration Block +tile.fantasyblock.6.desc=Purpled Fantasy Pillar +tile.fantasyblock.7.desc=Purpled Fantasy Pillar Decoration +tile.fantasyblock.8.desc=Purpled Fantasy Booty Snake Decoration +tile.fantasyblock.9.desc=Purpled Fantasy Booty Noise Decoration +tile.fantasyblock.10.desc=Purpled Fantasy Booty Engravings Decoration +tile.fantasyblock.11.desc=Purpled Fantasy Booty Chains Decoration +tile.fantasyblock.12.desc=Purpled Fantasy Plate Decoration +tile.fantasyblock.13.desc=Purpled Fantasy Block +tile.fantasyblock.14.desc=Purpled Fantasy Bricks in disarray +tile.fantasyblock.15.desc=Purpled Worn Fantasy Bricks + +#Fantasy block 2 +tile.fantasyblock2.name=Fantasy Block +tile.fantasyblock2.0.desc=Fantasy Brick +tile.fantasyblock2.1.desc=Faded Fantasy Brick +tile.fantasyblock2.2.desc=Worn Fantasy Brick +tile.fantasyblock2.3.desc=Damaged Fantasy Bricks +tile.fantasyblock2.4.desc=Fantasy Decoration +tile.fantasyblock2.5.desc=Fantasy Decoration Block +tile.fantasyblock2.6.desc=Fantasy Pillar +tile.fantasyblock2.7.desc=Fantasy Pillar Decoration +tile.fantasyblock2.8.desc=Fantasy Booty Snake Decoration +tile.fantasyblock2.9.desc=Fantasy Booty Noise Decoration +tile.fantasyblock2.10.desc=Fantasy Booty Engravings Decoration +tile.fantasyblock2.11.desc=Fantasy Booty Chains Decoration +tile.fantasyblock2.12.desc=Fantasy Plate Decoration +tile.fantasyblock2.13.desc=Fantasy Block +tile.fantasyblock2.14.desc=Fantasy Bricks in disarray +tile.fantasyblock2.15.desc=Worn Fantasy Bricks + +#Wall fer punchin' thru +tile.paperwall.name=Paperwall +tile.paperwall.0.desc=Boxed Paperwall +tile.paperwall.1.desc=Middle Striked Paperwall +tile.paperwall.2.desc=Crossed Paperwall +tile.paperwall.3.desc=Six Sectioned Paperwall +tile.paperwall.4.desc=Vertically Striked Paperwall +tile.paperwall.5.desc=Horizontally Striked Paperwall +tile.paperwall.6.desc=Floral Adorned Paperwall +tile.paperwall.7.desc=Plain Paperwall +tile.paperwall.8.desc=Door Shaped Paperwall + +#Woolen Clay +tile.woolen_clay.name=Sailcloth Clay +tile.woolenClay.0.desc=White Sailcloth Clay +tile.woolenClay.1.desc=Orange Sailcloth Clay +tile.woolenClay.2.desc=Magenta Sailcloth Clay +tile.woolenClay.3.desc=Light Ocean Blue Sailcloth Clay +tile.woolenClay.4.desc=Yellow Sailcloth Clay +tile.woolenClay.5.desc=Lime Sailcloth Clay +tile.woolenClay.6.desc=Pink Sailcloth Clay +tile.woolenClay.7.desc=Grey Sailcloth Clay +tile.woolenClay.8.desc=Light Grey Sailcloth Clay +tile.woolenClay.9.desc=Cyan Sailcloth Clay +tile.woolenClay.10.desc=Purple Sailcloth Clay +tile.woolenClay.11.desc=Ocean Blue Sailcloth Clay +tile.woolenClay.12.desc=Brown Sailcloth Clay +tile.woolenClay.13.desc=Green Sailcloth Clay +tile.woolenClay.14.desc=Blood Red Sailcloth Clay +tile.woolenClay.15.desc=Kraken Black Sailcloth Clay + +#Laboratory Block +tile.laboratoryblock.name=Laboratory Block +tile.laboratory.0.desc=Wall Panel +tile.laboratory.1.desc=Dotted Panel +tile.laboratory.2.desc=Enamelled Wall +tile.laboratory.3.desc=Enamelled Roundel Wall +tile.laboratory.4.desc=Enamelled Wall Vents +tile.laboratory.5.desc=Large Enamelled Tile +tile.laboratory.6.desc=Small Enamelled Tiles +tile.laboratory.7.desc=Laboratory Floor +tile.laboratory.8.desc=Checkerboard Floor +tile.laboratory.9.desc=Clear Panel +tile.laboratory.10.desc=Fuzzy Panel +tile.laboratory.11.desc=Large Steel Tile +tile.laboratory.12.desc=Small Steel Tiles +tile.laboratory.13.desc=Direction Console (Right) +tile.laboratory.14.desc=Direction Console (Left) +tile.laboratory.15.desc=Infarrmation Console + +# Creative Tab localizations +itemGroup.tabChiselBlocks=Chisel Blocks +itemGroup.tabChisel=Chisel Items + +#Container +container.chisel=Chisel +container.chisel.title=Carve blocks +container.chisel.titleShort=Carve From 27c532a4fcc59f8caad0037a6839d60fac2cc60c Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 14 Dec 2014 23:47:13 +0000 Subject: [PATCH 2/3] Update the package name --- .../minecraft/chisel/BlockNameConversion.java | 7 +- .../minecraft/chisel/Chisel.java | 53 ++++++------ .../minecraft/chisel/ChiselLeftClick.java | 17 ++-- .../minecraft/chisel/Configurations.java | 2 +- .../minecraft/chisel/Crafting.java | 8 +- .../minecraft/chisel/Packets.java | 2 +- .../cricketcraft}/minecraft/chisel/Waila.java | 6 +- .../minecraft/chisel/api/ChiselMode.java | 2 +- .../minecraft/chisel/api/ICarvable.java | 8 ++ .../minecraft/chisel/api/IChiselMode.java | 2 +- .../minecraft/chisel/api/IFacade.java | 2 +- .../chisel/block/BlockAutoChisel.java | 13 +-- .../chisel/block/BlockBeaconBase.java | 2 +- .../minecraft/chisel/block/BlockCarvable.java | 15 ++-- .../chisel/block/BlockCarvableGlass.java | 15 ++-- .../chisel/block/BlockCarvablePane.java | 15 ++-- .../chisel/block/BlockCarvablePowered.java | 2 +- .../chisel/block/BlockCarvablePumpkin.java | 10 ++- .../minecraft/chisel/block/BlockCloud.java | 6 +- .../minecraft/chisel/block/BlockConcrete.java | 8 +- .../minecraft/chisel/block/BlockEldritch.java | 4 +- .../chisel/block/BlockGrimstone.java | 12 +-- .../chisel/block/BlockHolystone.java | 8 +- .../chisel/block/BlockLavastone.java | 6 +- .../minecraft/chisel/block/BlockLeaf.java | 2 +- .../chisel/block/BlockLightstoneCarvable.java | 2 +- .../chisel/block/BlockMarbleBookshelf.java | 2 +- .../chisel/block/BlockMarbleCarpet.java | 14 ++-- .../chisel/block/BlockMarbleIce.java | 12 +-- .../chisel/block/BlockMarbleIceStairs.java | 8 +- .../chisel/block/BlockMarbleLamp.java | 2 +- .../chisel/block/BlockMarblePillar.java | 7 +- .../chisel/block/BlockMarbleSlab.java | 2 +- .../chisel/block/BlockMarbleStairs.java | 14 ++-- .../chisel/block/BlockMarbleStairsMaker.java | 10 ++- .../block/BlockMarbleStairsMakerCreator.java | 5 +- .../chisel/block/BlockMarbleTexturedOre.java | 12 +-- .../chisel/block/BlockMarbleWall.java | 8 +- .../minecraft/chisel/block/BlockPresent.java | 24 +++--- .../minecraft/chisel/block/BlockRoadLine.java | 9 +- .../chisel/block/BlockSnakestone.java | 8 +- .../chisel/block/BlockSnakestoneObsidian.java | 6 +- .../minecraft/chisel/block/BlockSpikes.java | 12 +-- .../chisel/block/BlockTexturedOre.java | 6 +- .../chisel/block/BlockVoidstone.java | 16 ++-- .../chisel/block/BlockVoidstonePillar.java | 11 +-- .../chisel/block/BlockWaterstone.java | 2 +- .../chisel/block/ItemBlockAutoChisel.java | 2 +- .../tileentity/TileEntityAutoChisel.java | 2 +- .../block/tileentity/TileEntityPresent.java | 10 +-- .../chisel/carving/CarvableHelper.java | 21 ++--- .../chisel/carving/CarvableVariation.java | 5 +- .../minecraft/chisel/carving/Carving.java | 6 +- .../chisel/carving/CarvingGroup.java | 2 +- .../chisel/carving/CarvingVariation.java | 2 +- .../chisel/client/GeneralChiselClient.java | 28 +++---- .../chisel/client/gui/GuiAutoChisel.java | 7 +- .../chisel/client/gui/GuiChisel.java | 9 +- .../chisel/client/gui/GuiChiselConfig.java | 8 +- .../minecraft/chisel/client/gui/GuiEdit.java | 2 +- .../chisel/client/gui/GuiElement.java | 2 +- .../chisel/client/gui/GuiExButton.java | 2 +- .../chisel/client/gui/GuiFactory.java | 2 +- .../minecraft/chisel/client/gui/GuiLabel.java | 2 +- .../chisel/client/gui/GuiPresent.java | 7 +- .../chisel/client/gui/GuiScreenPlus.java | 7 +- .../chisel/client/gui/GuilScrolledBox.java | 2 +- .../chisel/client/gui/InputEvent.java | 2 +- .../chisel/client/gui/InputKeyboardEvent.java | 2 +- .../chisel/client/gui/InputMouseEvent.java | 2 +- .../chisel/client/gui/Scrollbar.java | 5 +- .../chisel/client/gui/TexturedBox.java | 2 +- .../chisel/client/model/ModelAutoChisel.java | 5 +- .../render/BlockAdvancedMarbleRenderer.java | 13 +-- .../client/render/BlockCarpetRenderer.java | 5 +- .../client/render/BlockEldritchRenderer.java | 25 +++--- .../render/BlockMarblePaneRenderer.java | 5 +- .../render/BlockMarblePillarRenderer.java | 9 +- .../render/BlockMarbleStairsRenderer.java | 7 +- .../client/render/BlockNoCTMRenderer.java | 5 +- .../client/render/BlockRoadLineRenderer.java | 8 +- .../render/BlockSnakeStoneRenderer.java | 7 +- .../client/render/BlockSpikesRenderer.java | 9 +- .../render/BlockTexturedOreRenderer.java | 7 +- .../minecraft/chisel/client/render/CTM.java | 5 +- .../chisel/client/render/RenderBlocksCTM.java | 2 +- .../client/render/RenderBlocksCTMCarpet.java | 2 +- .../client/render/RenderBlocksColumn.java | 2 +- .../client/render/RenderBlocksEldritch.java | 2 +- .../chisel/client/render/TextureSubmap.java | 2 +- .../chisel/client/render/TextureVirtual.java | 2 +- .../render/item/ItemAutoChiselRenderer.java | 5 +- .../render/item/ItemChiselRenderer.java | 2 +- .../render/item/ItemPresentRenderer.java | 5 +- .../client/render/tile/RenderAutoChisel.java | 7 +- .../client/render/tile/RenderPresent.java | 9 +- .../chisel/compat/Compatibility.java | 7 +- .../chisel/compat/FMPIntegration.java | 8 +- .../chisel/compat/MarbleCompatibility.java | 6 +- .../chisel/compat/ModIntegration.java | 2 +- .../chisel/entity/EntityBallOMoss.java | 11 +-- .../chisel/entity/EntityCloudInABottle.java | 6 +- .../chisel/entity/EntitySmashingRock.java | 5 +- .../chisel/entity/fx/EntityBallOMossFX.java | 9 +- .../chisel/entity/fx/EntityGrimstoneFX.java | 7 +- .../chisel/entity/fx/EntityHolystoneFX.java | 7 +- .../entity/fx/EntitySnakestoneObsidianFX.java | 7 +- .../chisel/entity/fx/EntityVoidstoneFX.java | 7 +- .../minecraft/chisel/init/ModBlocks.java | 84 ++++++++++--------- .../minecraft/chisel/init/ModItems.java | 23 ++--- .../minecraft/chisel/init/ModTabs.java | 2 +- .../chisel/inventory/ContainerAutoChisel.java | 7 +- .../chisel/inventory/ContainerChisel.java | 9 +- .../chisel/inventory/ContainerPresent.java | 2 +- .../inventory/InventoryChiselSelection.java | 6 +- .../inventory/InventoryLargePresent.java | 2 +- .../chisel/inventory/SlotChiselInput.java | 2 +- .../chisel/inventory/SlotChiselPlayer.java | 2 +- .../chisel/inventory/SlotChiselSelection.java | 7 +- .../minecraft/chisel/item/ItemBallOMoss.java | 5 +- .../minecraft/chisel/item/ItemCarvable.java | 12 +-- .../minecraft/chisel/item/ItemChisel.java | 14 ++-- .../chisel/item/ItemCloudInABottle.java | 5 +- .../minecraft/chisel/item/ItemMarbleSlab.java | 5 +- .../chisel/item/ItemSmashingRock.java | 5 +- .../minecraft/chisel/item/ItemUpgrade.java | 8 +- .../minecraft/chisel/proxy/ClientProxy.java | 50 +++++------ .../minecraft/chisel/proxy/CommonProxy.java | 7 +- .../chisel/utils/BlockTexturedOre.java | 2 +- .../utils/BlockTexturedOreRenderer.java | 2 +- .../minecraft/chisel/utils/Drawing.java | 2 +- .../chisel/utils/DummyContainer.java | 2 +- .../minecraft/chisel/utils/General.java | 2 +- .../minecraft/chisel/utils/GeneralClient.java | 2 +- .../minecraft/chisel/utils/GuiHandler.java | 2 +- .../minecraft/chisel/utils/ItemMetaBlock.java | 2 +- .../chisel/world/GeneratorLimestone.java | 2 +- .../chisel/world/GeneratorMarble.java | 2 +- .../jbcs/minecraft/chisel/api/ICarvable.java | 8 -- 139 files changed, 577 insertions(+), 500 deletions(-) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/BlockNameConversion.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/Chisel.java (79%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/ChiselLeftClick.java (94%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/Configurations.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/Crafting.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/Packets.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/Waila.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/api/ChiselMode.java (63%) create mode 100644 src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/api/IChiselMode.java (73%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/api/IFacade.java (84%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockAutoChisel.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockBeaconBase.java (85%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockCarvable.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockCarvableGlass.java (83%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockCarvablePane.java (81%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockCarvablePowered.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockCarvablePumpkin.java (84%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockCloud.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockConcrete.java (84%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockEldritch.java (68%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockGrimstone.java (75%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockHolystone.java (82%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockLavastone.java (84%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockLeaf.java (83%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockLightstoneCarvable.java (92%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleBookshelf.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleCarpet.java (81%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleIce.java (87%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleIceStairs.java (86%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleLamp.java (97%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarblePillar.java (81%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleSlab.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleStairs.java (88%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleStairsMaker.java (87%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java (59%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleTexturedOre.java (83%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockMarbleWall.java (86%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockPresent.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockRoadLine.java (85%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockSnakestone.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockSnakestoneObsidian.java (87%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockSpikes.java (85%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockTexturedOre.java (89%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockVoidstone.java (72%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockVoidstonePillar.java (79%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/BlockWaterstone.java (85%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/ItemBlockAutoChisel.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java (99%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/block/tileentity/TileEntityPresent.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/carving/CarvableHelper.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/carving/CarvableVariation.java (84%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/carving/Carving.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/carving/CarvingGroup.java (84%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/carving/CarvingVariation.java (90%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/GeneralChiselClient.java (92%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiAutoChisel.java (80%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiChisel.java (87%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiChiselConfig.java (76%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiEdit.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiElement.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiExButton.java (97%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiFactory.java (92%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiLabel.java (88%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiPresent.java (85%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuiScreenPlus.java (97%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/GuilScrolledBox.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/InputEvent.java (51%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/InputKeyboardEvent.java (65%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/InputMouseEvent.java (78%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/Scrollbar.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/gui/TexturedBox.java (97%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/model/ModelAutoChisel.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java (87%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockCarpetRenderer.java (79%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockEldritchRenderer.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockMarblePaneRenderer.java (99%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockMarblePillarRenderer.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java (89%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockNoCTMRenderer.java (92%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockRoadLineRenderer.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockSpikesRenderer.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/BlockTexturedOreRenderer.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/CTM.java (99%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/RenderBlocksCTM.java (99%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/RenderBlocksColumn.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/RenderBlocksEldritch.java (99%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/TextureSubmap.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/TextureVirtual.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/item/ItemChiselRenderer.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/item/ItemPresentRenderer.java (94%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/tile/RenderAutoChisel.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/client/render/tile/RenderPresent.java (94%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/compat/Compatibility.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/compat/FMPIntegration.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/compat/MarbleCompatibility.java (97%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/compat/ModIntegration.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/entity/EntityBallOMoss.java (91%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/entity/EntityCloudInABottle.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/entity/EntitySmashingRock.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/entity/fx/EntityBallOMossFX.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/entity/fx/EntityGrimstoneFX.java (90%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/entity/fx/EntityHolystoneFX.java (90%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java (94%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/entity/fx/EntityVoidstoneFX.java (90%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/init/ModBlocks.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/init/ModItems.java (75%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/init/ModTabs.java (93%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/inventory/ContainerAutoChisel.java (94%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/inventory/ContainerChisel.java (94%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/inventory/ContainerPresent.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/inventory/InventoryChiselSelection.java (97%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/inventory/InventoryLargePresent.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/inventory/SlotChiselInput.java (94%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/inventory/SlotChiselPlayer.java (94%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/inventory/SlotChiselSelection.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/item/ItemBallOMoss.java (88%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/item/ItemCarvable.java (81%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/item/ItemChisel.java (78%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/item/ItemCloudInABottle.java (88%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/item/ItemMarbleSlab.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/item/ItemSmashingRock.java (88%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/item/ItemUpgrade.java (92%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/proxy/ClientProxy.java (55%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/proxy/CommonProxy.java (64%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/utils/BlockTexturedOre.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/utils/BlockTexturedOreRenderer.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/utils/Drawing.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/utils/DummyContainer.java (83%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/utils/General.java (98%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/utils/GeneralClient.java (96%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/utils/GuiHandler.java (97%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/utils/ItemMetaBlock.java (92%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/world/GeneratorLimestone.java (95%) rename src/main/java/{info/jbcs => com/cricketcraft}/minecraft/chisel/world/GeneratorMarble.java (95%) delete mode 100644 src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java diff --git a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java b/src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java rename to src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java index d3bacc48..02548e87 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel; - -import info.jbcs.minecraft.chisel.utils.General; +package com.cricketcraft.minecraft.chisel; import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.item.Item; + +import com.cricketcraft.minecraft.chisel.utils.General; + import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java similarity index 79% rename from src/main/java/info/jbcs/minecraft/chisel/Chisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java index 9c79d11d..a2a4beae 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java @@ -1,25 +1,4 @@ -package info.jbcs.minecraft.chisel; - -import info.jbcs.minecraft.chisel.block.BlockCarvable; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; -import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel; -import info.jbcs.minecraft.chisel.client.gui.GuiChisel; -import info.jbcs.minecraft.chisel.client.gui.GuiPresent; -import info.jbcs.minecraft.chisel.compat.Compatibility; -import info.jbcs.minecraft.chisel.compat.FMPIntegration; -import info.jbcs.minecraft.chisel.compat.ModIntegration; -import info.jbcs.minecraft.chisel.init.ModBlocks; -import info.jbcs.minecraft.chisel.init.ModItems; -import info.jbcs.minecraft.chisel.init.ModTabs; -import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel; -import info.jbcs.minecraft.chisel.inventory.ContainerChisel; -import info.jbcs.minecraft.chisel.inventory.ContainerPresent; -import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; -import info.jbcs.minecraft.chisel.proxy.CommonProxy; -import info.jbcs.minecraft.chisel.utils.General; -import info.jbcs.minecraft.chisel.world.GeneratorLimestone; -import info.jbcs.minecraft.chisel.world.GeneratorMarble; +package com.cricketcraft.minecraft.chisel; import java.io.File; @@ -30,6 +9,28 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; + +import com.cricketcraft.minecraft.chisel.block.BlockCarvable; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; +import com.cricketcraft.minecraft.chisel.client.gui.GuiAutoChisel; +import com.cricketcraft.minecraft.chisel.client.gui.GuiChisel; +import com.cricketcraft.minecraft.chisel.client.gui.GuiPresent; +import com.cricketcraft.minecraft.chisel.compat.Compatibility; +import com.cricketcraft.minecraft.chisel.compat.FMPIntegration; +import com.cricketcraft.minecraft.chisel.compat.ModIntegration; +import com.cricketcraft.minecraft.chisel.init.ModBlocks; +import com.cricketcraft.minecraft.chisel.init.ModItems; +import com.cricketcraft.minecraft.chisel.init.ModTabs; +import com.cricketcraft.minecraft.chisel.inventory.ContainerAutoChisel; +import com.cricketcraft.minecraft.chisel.inventory.ContainerChisel; +import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; +import com.cricketcraft.minecraft.chisel.inventory.InventoryChiselSelection; +import com.cricketcraft.minecraft.chisel.proxy.CommonProxy; +import com.cricketcraft.minecraft.chisel.utils.General; +import com.cricketcraft.minecraft.chisel.world.GeneratorLimestone; +import com.cricketcraft.minecraft.chisel.world.GeneratorMarble; + import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; @@ -52,11 +53,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") +@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") public class Chisel { public static final String MOD_ID = "chisel"; - public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f); + public static final BlockCarvable.SoundType soundTempleFootstep = new com.cricketcraft.minecraft.chisel.block.BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f); public static final String MOD_NAME = "Chisel 2"; public static final String VERSION = "2.1.3"; public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f); @@ -69,7 +70,7 @@ public class Chisel @Instance(MOD_ID) public static Chisel instance; - @SidedProxy(clientSide = "info.jbcs.minecraft.chisel.proxy.ClientProxy", serverSide = "info.jbcs.minecraft.chisel.proxy.CommonProxy") + @SidedProxy(clientSide = "com.cricketcraft.minecraft.chisel.proxy.ClientProxy", serverSide = "com.cricketcraft.minecraft.chisel.proxy.CommonProxy") public static CommonProxy proxy; @SideOnly(Side.CLIENT) @@ -185,7 +186,7 @@ public class Chisel MinecraftForge.EVENT_BUS.register(new ChiselLeftClick()); FMLCommonHandler.instance().bus().register(instance); - FMLInterModComms.sendMessage("Waila", "register", "info.jbcs.minecraft.chisel.Waila.register"); + FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.minecraft.chisel.Waila.register"); } @EventHandler diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java b/src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java rename to src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java index 4d8b442f..2a84c318 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java @@ -1,11 +1,4 @@ -package info.jbcs.minecraft.chisel; - -import info.jbcs.minecraft.chisel.api.ChiselMode; -import info.jbcs.minecraft.chisel.carving.CarvingVariation; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.chisel.init.ModBlocks; -import info.jbcs.minecraft.chisel.init.ModItems; -import info.jbcs.minecraft.chisel.item.ItemChisel; +package com.cricketcraft.minecraft.chisel; import java.util.HashMap; import java.util.Random; @@ -19,6 +12,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; + +import com.cricketcraft.minecraft.chisel.api.ChiselMode; +import com.cricketcraft.minecraft.chisel.carving.CarvingVariation; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.minecraft.chisel.init.ModBlocks; +import com.cricketcraft.minecraft.chisel.init.ModItems; +import com.cricketcraft.minecraft.chisel.item.ItemChisel; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/info/jbcs/minecraft/chisel/Configurations.java b/src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/Configurations.java rename to src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java index 2918f600..7d9ad0cc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Configurations.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel; +package com.cricketcraft.minecraft.chisel; import net.minecraftforge.common.config.Configuration; diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/Crafting.java rename to src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java index b2bd25c4..fd381add 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java @@ -1,7 +1,5 @@ -package info.jbcs.minecraft.chisel; +package com.cricketcraft.minecraft.chisel; -import info.jbcs.minecraft.chisel.init.ModBlocks; -import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -10,6 +8,10 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; + +import com.cricketcraft.minecraft.chisel.init.ModBlocks; +import com.cricketcraft.minecraft.chisel.init.ModItems; + import cpw.mods.fml.common.registry.GameRegistry; public class Crafting { diff --git a/src/main/java/info/jbcs/minecraft/chisel/Packets.java b/src/main/java/com/cricketcraft/minecraft/chisel/Packets.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/Packets.java rename to src/main/java/com/cricketcraft/minecraft/chisel/Packets.java index abe3899c..bb663f29 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Packets.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/Packets.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel; +package com.cricketcraft.minecraft.chisel; public class Packets// extends MessageHandlerBase { diff --git a/src/main/java/info/jbcs/minecraft/chisel/Waila.java b/src/main/java/com/cricketcraft/minecraft/chisel/Waila.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/Waila.java rename to src/main/java/com/cricketcraft/minecraft/chisel/Waila.java index caed69eb..6bbe52aa 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Waila.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/Waila.java @@ -1,6 +1,4 @@ -package info.jbcs.minecraft.chisel; - -import info.jbcs.minecraft.chisel.block.BlockCarvable; +package com.cricketcraft.minecraft.chisel; import java.util.List; @@ -10,6 +8,8 @@ import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import net.minecraft.item.ItemStack; +import com.cricketcraft.minecraft.chisel.block.BlockCarvable; + public class Waila implements IWailaDataProvider { diff --git a/src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java b/src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java similarity index 63% rename from src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java rename to src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java index 186803e6..e24651bc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.api; +package com.cricketcraft.minecraft.chisel.api; public enum ChiselMode { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java new file mode 100644 index 00000000..6bc5c312 --- /dev/null +++ b/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java @@ -0,0 +1,8 @@ +package com.cricketcraft.minecraft.chisel.api; + +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; + +public interface ICarvable +{ + public CarvableVariation getVariation(int metadata); +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java b/src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java similarity index 73% rename from src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java rename to src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java index 1e86535f..dc610112 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.api; +package com.cricketcraft.minecraft.chisel.api; import net.minecraft.item.ItemStack; diff --git a/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java b/src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java similarity index 84% rename from src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java rename to src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java index de49cf38..f104c364 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.api; +package com.cricketcraft.minecraft.chisel.api; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java index 8899a5aa..14e390b8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java @@ -1,9 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import info.jbcs.minecraft.chisel.init.ModBlocks; -import info.jbcs.minecraft.chisel.init.ModItems; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; import java.util.Random; @@ -19,6 +14,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.minecraft.chisel.init.ModBlocks; +import com.cricketcraft.minecraft.chisel.init.ModItems; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java similarity index 85% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java index ee889ea5..2294de03 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java index 30d565f3..b2dd4126 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java @@ -1,10 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -15,6 +9,13 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java similarity index 83% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java index 489fa921..0297acc5 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java @@ -1,10 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -14,6 +8,13 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; + +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java similarity index 81% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java index 2aa8627d..69dc0b15 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java @@ -1,10 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.client.render.BlockMarblePaneRenderer; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -14,6 +8,13 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; + +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePaneRenderer; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java index 97864ce2..4d36d58c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java similarity index 84% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java index 301452c0..b8367422 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java @@ -1,11 +1,13 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; import net.minecraft.block.BlockPumpkin; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; + +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java index 391b10ee..3d84d354 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java @@ -1,8 +1,6 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Configurations; - import java.util.Random; import net.minecraft.block.material.Material; @@ -12,6 +10,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.Configurations; + public class BlockCloud extends BlockCarvable { public BlockCloud() { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java similarity index 84% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java index 8d5e6f65..5e06a332 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java @@ -1,10 +1,12 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; + +import com.cricketcraft.minecraft.chisel.Configurations; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java similarity index 68% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java index 32d47a1f..6134ec7a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java @@ -1,6 +1,6 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.Chisel; public class BlockEldritch extends BlockCarvable diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java similarity index 75% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java index 30ce6540..d52ef090 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java @@ -1,9 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.chisel.init.ModTabs; -import info.jbcs.minecraft.chisel.utils.General; +package com.cricketcraft.minecraft.chisel.block; import java.util.Random; @@ -12,6 +7,11 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.minecraft.chisel.init.ModTabs; +import com.cricketcraft.minecraft.chisel.utils.General; + public class BlockGrimstone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java similarity index 82% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java index 359a6e0c..2625b84e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java @@ -1,7 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.chisel.utils.General; +package com.cricketcraft.minecraft.chisel.block; import java.util.Random; @@ -10,6 +7,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.minecraft.chisel.utils.General; + public class BlockHolystone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java similarity index 84% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java index d5a74dca..13f7fe3a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java @@ -1,13 +1,13 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; - import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; + public class BlockLavastone extends BlockMarbleTexturedOre { public BlockLavastone(Material mat, String baseIcon) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java similarity index 83% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java index d32db7ec..d7ccef65 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import net.minecraft.block.material.Material; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java similarity index 92% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java index 2bd4af4f..b516fb67 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java index 60faf177..13df7981 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java similarity index 81% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java index 006a081c..3e154cc1 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java @@ -1,10 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -16,6 +10,12 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + public class BlockMarbleCarpet extends BlockCarpet implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java similarity index 87% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java index ebad141a..a548fed8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java @@ -1,9 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -17,6 +12,11 @@ import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + public class BlockMarbleIce extends BlockIce implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java similarity index 86% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java index e1b8262b..c9d4558e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java @@ -1,7 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.init.ModBlocks; +package com.cricketcraft.minecraft.chisel.block; import java.util.Random; @@ -9,6 +6,9 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.init.ModBlocks; + public class BlockMarbleIceStairs extends BlockMarbleStairs { public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java index 335ef726..caebac85 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java similarity index 81% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java index 029fa4d5..ad1a660d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.client.render.BlockMarblePillarRenderer; import net.minecraft.block.material.Material; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePillarRenderer; + public class BlockMarblePillar extends BlockCarvable { public IIcon sides[] = new IIcon[6]; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java index e0df6d64..0cc9b46c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java similarity index 88% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java index 9e538780..b0da3649 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java @@ -1,10 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -19,6 +13,12 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.client.render.BlockMarbleStairsRenderer; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + public class BlockMarbleStairs extends BlockStairs implements ICarvable { CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java similarity index 87% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java index 9a29b102..ec1b76a9 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java @@ -1,11 +1,13 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.item.ItemCarvable; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; + +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.item.ItemCarvable; + import cpw.mods.fml.common.registry.GameRegistry; public class BlockMarbleStairsMaker diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java similarity index 59% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java index 418cfe2e..f242cae8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java @@ -1,8 +1,9 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; import net.minecraft.block.Block; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; + public interface BlockMarbleStairsMakerCreator { public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java similarity index 83% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java index b11d2d32..7fdb2578 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java @@ -1,9 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -14,6 +9,11 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java similarity index 86% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java index 67c0bf0b..25c34399 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java @@ -1,7 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -12,6 +9,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + public class BlockMarbleWall extends BlockWall { CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java index 9d00a212..8dd8cd6e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java @@ -1,12 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.init.ModTabs; -import info.jbcs.minecraft.chisel.inventory.InventoryLargePresent; +package com.cricketcraft.minecraft.chisel.block; import java.util.Calendar; import java.util.Iterator; @@ -32,6 +24,15 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.init.ModTabs; +import com.cricketcraft.minecraft.chisel.inventory.InventoryLargePresent; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -390,13 +391,14 @@ public class BlockPresent extends BlockContainer implements ICarvable { return Container.calcRedstoneFromInventory(getInventory(world, x, y, z)); } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { this.blockIcon = register.registerIcon("planks_oak"); } public IInventory getInventory(World world, int x, int y, int z) { - Object object = (TileEntityPresent) world.getTileEntity(x, y, z); + Object object = world.getTileEntity(x, y, z); if (object == null) { return null; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java similarity index 85% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java index 1466b25d..dc5c5e13 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java @@ -1,7 +1,5 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer; -import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,6 +8,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.client.render.BlockRoadLineRenderer; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + public class BlockRoadLine extends Block { public IIcon aloneIcon; @@ -53,7 +54,7 @@ public class BlockRoadLine extends Block @Override public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { - return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone); + return World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone); } @Override diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java index 5997eacd..e8565119 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java @@ -1,7 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer; -import info.jbcs.minecraft.chisel.init.ModTabs; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; @@ -16,6 +13,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.client.render.BlockSnakeStoneRenderer; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + public class BlockSnakestone extends Block { static final int SEC_HEAD = 0; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java similarity index 87% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java index 05cf10fc..a96cb769 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java @@ -1,14 +1,14 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; - import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; + public class BlockSnakestoneObsidian extends BlockSnakestone { public IIcon[] particles = new IIcon[8]; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java similarity index 85% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java index 65b0f0fe..8ec7ee62 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java @@ -1,9 +1,5 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,6 +8,12 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; + +import com.cricketcraft.minecraft.chisel.Configurations; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.minecraft.chisel.client.render.BlockSpikesRenderer; +import com.cricketcraft.minecraft.chisel.utils.General; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java similarity index 89% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java index ca9fa5f8..cd1de5d8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java @@ -1,11 +1,13 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; + -import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import com.cricketcraft.minecraft.chisel.client.render.BlockTexturedOreRenderer; + public class BlockTexturedOre extends Block { public int currentPass; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java similarity index 72% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java index 0edfc2bf..a424d01d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java @@ -1,11 +1,4 @@ -package info.jbcs.minecraft.chisel.block; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.chisel.utils.General; +package com.cricketcraft.minecraft.chisel.block; import java.util.Random; @@ -15,6 +8,13 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.minecraft.chisel.utils.General; + public class BlockVoidstone extends Block implements ICarvable{ public CarvableHelper carverHelper; public IIcon iconParticle; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java similarity index 79% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java index 0cd9ea95..4d84bcfa 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java @@ -1,14 +1,15 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.init.ModTabs; + public class BlockVoidstonePillar extends Block implements ICarvable{ public static IIcon topBottom, pillarSide; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java similarity index 85% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java index 58bee7dd..9306a2fd 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import net.minecraft.block.material.Material; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java index 2b020471..53868f74 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block; +package com.cricketcraft.minecraft.chisel.block; import java.util.List; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java similarity index 99% rename from src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java index d55f37dc..89cf037d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.block.tileentity; +package com.cricketcraft.minecraft.chisel.block.tileentity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java index 662419be..ce0c85c5 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java @@ -1,8 +1,4 @@ -package info.jbcs.minecraft.chisel.block.tileentity; - -import info.jbcs.minecraft.chisel.block.BlockPresent; -import info.jbcs.minecraft.chisel.inventory.ContainerPresent; -import info.jbcs.minecraft.chisel.inventory.InventoryLargePresent; +package com.cricketcraft.minecraft.chisel.block.tileentity; import java.util.Iterator; import java.util.List; @@ -13,6 +9,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.AxisAlignedBB; +import com.cricketcraft.minecraft.chisel.block.BlockPresent; +import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; +import com.cricketcraft.minecraft.chisel.inventory.InventoryLargePresent; + public class TileEntityPresent extends TileEntityChest { public TileEntityPresent() { diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java rename to src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java index 1b5e6caa..7bd86c59 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java @@ -1,13 +1,4 @@ -package info.jbcs.minecraft.chisel.carving; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; -import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; -import info.jbcs.minecraft.chisel.client.render.CTM; -import info.jbcs.minecraft.chisel.client.render.TextureSubmap; -import info.jbcs.minecraft.chisel.item.ItemCarvable; -import info.jbcs.minecraft.chisel.utils.GeneralClient; +package com.cricketcraft.minecraft.chisel.carving; import java.util.ArrayList; import java.util.HashSet; @@ -22,6 +13,16 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.Configurations; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; +import com.cricketcraft.minecraft.chisel.client.render.CTM; +import com.cricketcraft.minecraft.chisel.client.render.TextureSubmap; +import com.cricketcraft.minecraft.chisel.item.ItemCarvable; +import com.cricketcraft.minecraft.chisel.utils.GeneralClient; + import cpw.mods.fml.common.registry.GameRegistry; public class CarvableHelper diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java b/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java similarity index 84% rename from src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java rename to src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java index b1858777..4d0d04c7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java @@ -1,9 +1,10 @@ -package info.jbcs.minecraft.chisel.carving; +package com.cricketcraft.minecraft.chisel.carving; -import info.jbcs.minecraft.chisel.client.render.TextureSubmap; import net.minecraft.block.Block; import net.minecraft.util.IIcon; +import com.cricketcraft.minecraft.chisel.client.render.TextureSubmap; + public class CarvableVariation { public String blockName; diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java b/src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java rename to src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java index 70b34bb1..345acc11 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java @@ -1,6 +1,4 @@ -package info.jbcs.minecraft.chisel.carving; - -import info.jbcs.minecraft.chisel.Chisel; +package com.cricketcraft.minecraft.chisel.carving; import java.util.ArrayList; import java.util.Collections; @@ -12,6 +10,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import com.cricketcraft.minecraft.chisel.Chisel; + public class Carving { HashMap carvingGroupsByName = new HashMap(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java b/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java similarity index 84% rename from src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java rename to src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java index a45a3935..a2e81a95 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.carving; +package com.cricketcraft.minecraft.chisel.carving; import java.util.ArrayList; diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java b/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java similarity index 90% rename from src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java rename to src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java index 37d33136..f846ea39 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.carving; +package com.cricketcraft.minecraft.chisel.carving; import net.minecraft.block.Block; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java similarity index 92% rename from src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java index 45ee1528..7031e741 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java @@ -1,17 +1,4 @@ -package info.jbcs.minecraft.chisel.client; - -import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.block.BlockGrimstone; -import info.jbcs.minecraft.chisel.block.BlockHolystone; -import info.jbcs.minecraft.chisel.block.BlockLavastone; -import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.chisel.block.BlockVoidstone; -import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX; -import info.jbcs.minecraft.chisel.entity.fx.EntityGrimstoneFX; -import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX; -import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; -import info.jbcs.minecraft.chisel.entity.fx.EntityVoidstoneFX; -import info.jbcs.minecraft.chisel.utils.GeneralClient; +package com.cricketcraft.minecraft.chisel.client; import java.util.Random; @@ -24,6 +11,19 @@ import net.minecraft.client.particle.EntityLavaFX; import net.minecraft.entity.Entity; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.Configurations; +import com.cricketcraft.minecraft.chisel.block.BlockGrimstone; +import com.cricketcraft.minecraft.chisel.block.BlockHolystone; +import com.cricketcraft.minecraft.chisel.block.BlockLavastone; +import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; +import com.cricketcraft.minecraft.chisel.block.BlockVoidstone; +import com.cricketcraft.minecraft.chisel.entity.fx.EntityBallOMossFX; +import com.cricketcraft.minecraft.chisel.entity.fx.EntityGrimstoneFX; +import com.cricketcraft.minecraft.chisel.entity.fx.EntityHolystoneFX; +import com.cricketcraft.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; +import com.cricketcraft.minecraft.chisel.entity.fx.EntityVoidstoneFX; +import com.cricketcraft.minecraft.chisel.utils.GeneralClient; + public class GeneralChiselClient { public static Random rand = new Random(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java similarity index 80% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java index 54ff085f..ec267d65 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java @@ -1,13 +1,14 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.minecraft.chisel.inventory.ContainerAutoChisel; + public class GuiAutoChisel extends GuiContainer { private static final ResourceLocation gui = new ResourceLocation("chisel:textures/autochisel-gui.png"); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java similarity index 87% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java index 950d3002..40f5e881 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java @@ -1,8 +1,5 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; -import info.jbcs.minecraft.chisel.inventory.ContainerChisel; -import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; -import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -10,6 +7,10 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.inventory.ContainerChisel; +import com.cricketcraft.minecraft.chisel.inventory.InventoryChiselSelection; +import com.cricketcraft.minecraft.chisel.utils.GeneralClient; + public class GuiChisel extends GuiContainer { public EntityPlayer player; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java similarity index 76% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java index 847b9084..27b8071b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java @@ -1,10 +1,12 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.Configurations; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; + +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.Configurations; + import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java index 86735a53..042a6c4c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java index 15908121..8fced107 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; import java.util.ArrayList; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java index a986cc16..6b104095 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; public class GuiExButton extends GuiElement { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java similarity index 92% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java index 344f36de..657df7dc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; import java.util.Set; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java similarity index 88% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java index fc4d2330..323d291a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; public class GuiLabel extends GuiElement { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java similarity index 85% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java index a50a41a7..5362c916 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java @@ -1,7 +1,5 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; -import info.jbcs.minecraft.chisel.inventory.ContainerPresent; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -9,6 +7,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; +import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; + public class GuiPresent extends GuiContainer { private static final ResourceLocation gui = new ResourceLocation("chisel:textures/present-gui.png"); private IInventory upper, lower; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java index 8112be99..38cb0bad 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java @@ -1,7 +1,5 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; -import info.jbcs.minecraft.chisel.utils.DummyContainer; -import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; @@ -12,6 +10,9 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.utils.DummyContainer; +import com.cricketcraft.minecraft.chisel.utils.GeneralClient; + public class GuiScreenPlus extends GuiContainer { public int screenW; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java index aa1a8a8e..781022cb 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java similarity index 51% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java index bccd1dd5..af073437 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; public class InputEvent { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java similarity index 65% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java index 4869df9c..61dd7052 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; public class InputKeyboardEvent extends InputEvent { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java similarity index 78% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java index da47d9d7..9677dd60 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; public class InputMouseEvent extends InputEvent { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java index 1d89172f..94290a50 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; -import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import org.lwjgl.input.Mouse; +import com.cricketcraft.minecraft.chisel.utils.GeneralClient; + public abstract class Scrollbar extends GuiButton { public boolean active; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java index 04d5dc98..3e234205 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.gui; +package com.cricketcraft.minecraft.chisel.client.gui; public class TexturedBox { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java index 962acd37..82703b75 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.model; +package com.cricketcraft.minecraft.chisel.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -99,7 +99,8 @@ public class ModelAutoChisel extends ModelBase setRotation(Shape12, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java similarity index 87% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java index f2e91dcd..eecfb177 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java @@ -1,16 +1,17 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java similarity index 79% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java index c2ead782..4f35fbdf 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java @@ -1,6 +1,7 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; + +import com.cricketcraft.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.Chisel; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java index 3866114d..b24d6968 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java @@ -1,13 +1,14 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -50,8 +51,8 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler double v1 = icon.getMinV(); double uu = icon.getInterpolatedU(8.0D); double vv = icon.getInterpolatedV(8.0D); - - + + int lyp=block.getMixedBrightnessForBlock(world, x, y+1, z); int lym=block.getMixedBrightnessForBlock(world, x, y-1, z); int lxp=block.getMixedBrightnessForBlock(world, x+1, y, z); @@ -61,11 +62,11 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler - - - - - + + + + + @@ -76,14 +77,14 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler u1 = icon.getMaxU(); v1 = icon.getMaxV(); vertex(1,u0,v0); vertex(5,u1,v0); vertex(6,u1,v1); vertex(2,u0,v1); - + icon = block.getIcon(1, meta); u0 = icon.getMinU(); v0 = icon.getMinV(); u1 = icon.getMaxU(); v1 = icon.getMaxV(); vertex(0,u0,v0); vertex(3,u0,v1); vertex(7,u1,v1); vertex(4,u1,v0); - + */ renderer.blockAccess = world; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java similarity index 99% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java index 12e1b0d8..e7288ad3 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java @@ -1,6 +1,5 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.client.renderer.EntityRenderer; @@ -11,6 +10,8 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java index 9f4b2c04..7e6ef3b2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java @@ -1,14 +1,15 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.block.BlockMarblePillar; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.BlockMarblePillar; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java similarity index 89% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java index 5157a25d..3657cd32 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java @@ -1,13 +1,14 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairs; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java similarity index 92% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java index 06579385..e28429b9 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java @@ -1,12 +1,13 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java index 9cf0f1e1..cf4f0a44 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java @@ -1,13 +1,15 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.block.BlockRoadLine; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.cricketcraft.minecraft.chisel.block.BlockRoadLine; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java index 5193cbdc..d0cd0f2d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java @@ -1,13 +1,14 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.block.BlockSnakestone; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.BlockSnakestone; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java index a998d977..78b31654 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java @@ -1,7 +1,4 @@ -package info.jbcs.minecraft.chisel.client.render; - -import info.jbcs.minecraft.chisel.init.ModBlocks; -import info.jbcs.minecraft.chisel.utils.Drawing; +package com.cricketcraft.minecraft.chisel.client.render; import java.util.Random; @@ -10,6 +7,10 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.cricketcraft.minecraft.chisel.init.ModBlocks; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java index f92011d3..a4c05c95 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java @@ -1,7 +1,5 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.block.BlockTexturedOre; -import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; @@ -9,6 +7,9 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.BlockTexturedOre; +import com.cricketcraft.minecraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java similarity index 99% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java index 4c63058e..300e23f9 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java @@ -1,9 +1,10 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.api.IFacade; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.minecraft.chisel.api.IFacade; + public class CTM { static int submaps[][] = { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java similarity index 99% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java index 14844492..21567991 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java index 0232d4fc..10b40e3b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.util.IIcon; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java index 0cf034fa..c5817803 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java similarity index 99% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java index 6fc9a115..eed380f7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java index 6f1220e1..41f6d2cb 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java index e24ee64b..5a6e79ef 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.render; +package com.cricketcraft.minecraft.chisel.client.render; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java index d8669c65..24c63ce4 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java @@ -1,12 +1,13 @@ -package info.jbcs.minecraft.chisel.client.render.item; +package com.cricketcraft.minecraft.chisel.client.render.item; -import info.jbcs.minecraft.chisel.client.model.ModelAutoChisel; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.client.model.ModelAutoChisel; + import cpw.mods.fml.client.FMLClientHandler; public class ItemAutoChiselRenderer implements IItemRenderer{ diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java index 5a845e8e..78e6cfeb 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.client.render.item; +package com.cricketcraft.minecraft.chisel.client.render.item; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java index 55717226..c6e4b95e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java @@ -1,6 +1,5 @@ -package info.jbcs.minecraft.chisel.client.render.item; +package com.cricketcraft.minecraft.chisel.client.render.item; -import info.jbcs.minecraft.chisel.Chisel; import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -8,6 +7,8 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.Chisel; + import cpw.mods.fml.client.FMLClientHandler; public class ItemPresentRenderer implements IItemRenderer { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java index f27e72be..5e489764 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java @@ -1,12 +1,10 @@ -package info.jbcs.minecraft.chisel.client.render.tile; +package com.cricketcraft.minecraft.chisel.client.render.tile; import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glRotatef; import static org.lwjgl.opengl.GL11.glScalef; import static org.lwjgl.opengl.GL11.glTranslatef; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import info.jbcs.minecraft.chisel.client.model.ModelAutoChisel; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -18,6 +16,9 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.minecraft.chisel.client.model.ModelAutoChisel; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java index e08f5487..d7c65d91 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java @@ -1,7 +1,5 @@ -package info.jbcs.minecraft.chisel.client.render.tile; +package com.cricketcraft.minecraft.chisel.client.render.tile; -import info.jbcs.minecraft.chisel.block.BlockPresent; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; import net.minecraft.block.Block; import net.minecraft.block.BlockChest; import net.minecraft.client.model.ModelChest; @@ -12,6 +10,9 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.cricketcraft.minecraft.chisel.block.BlockPresent; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; + import cpw.mods.fml.common.FMLLog; public class RenderPresent extends TileEntityChestRenderer { @@ -90,7 +91,7 @@ public class RenderPresent extends TileEntityChestRenderer { GL11.glTranslatef(0.0F, 0.0F, -1.0F); } - GL11.glRotatef((float) short1, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(short1, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); float f1 = present.prevLidAngle + (present.lidAngle - present.prevLidAngle) * partialTicks; float f2; diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java b/src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java rename to src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java index 2289cca1..3e83423b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java @@ -1,6 +1,7 @@ -package info.jbcs.minecraft.chisel.compat; +package com.cricketcraft.minecraft.chisel.compat; + +import com.cricketcraft.minecraft.chisel.carving.Carving; -import info.jbcs.minecraft.chisel.carving.Carving; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; @@ -14,7 +15,7 @@ public class Compatibility addSupport("ProjRed|Exploration", "projectred.exploration.stone", "marble", 0, 99); addSupport("bluepower", "marble", "marble", 0, 99); - + addSupport("PFAAGeologica", "strongStone", "marble", 5, 99); addSupport("PFAAGeologica", "strongStoneSlab", "marbleSlab", 5, 99); addSupport("PFAAGeologica", "strongStoneBrickStairs.marble", "marbleStairs", 0, 99); diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java b/src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java rename to src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java index 52c1ac0e..c692349a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java @@ -1,9 +1,11 @@ -package info.jbcs.minecraft.chisel.compat; +package com.cricketcraft.minecraft.chisel.compat; -import info.jbcs.minecraft.chisel.compat.ModIntegration.IModIntegration; -import info.jbcs.minecraft.chisel.init.ModBlocks; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; + +import com.cricketcraft.minecraft.chisel.compat.ModIntegration.IModIntegration; +import com.cricketcraft.minecraft.chisel.init.ModBlocks; + import cpw.mods.fml.common.event.FMLInterModComms; public class FMPIntegration implements IModIntegration{ diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java b/src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java rename to src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java index 7712f15d..87bc3da7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java @@ -1,7 +1,9 @@ -package info.jbcs.minecraft.chisel.compat; +package com.cricketcraft.minecraft.chisel.compat; -import info.jbcs.minecraft.chisel.carving.Carving; import net.minecraft.block.Block; + +import com.cricketcraft.minecraft.chisel.carving.Carving; + import cpw.mods.fml.common.event.FMLPostInitializationEvent; public class MarbleCompatibility diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java b/src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java rename to src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java index 66bb8435..e46f37fe 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.compat; +package com.cricketcraft.minecraft.chisel.compat; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java b/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java similarity index 91% rename from src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java rename to src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java index adc8ca1f..bfda35cb 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java @@ -1,9 +1,5 @@ -package info.jbcs.minecraft.chisel.entity; +package com.cricketcraft.minecraft.chisel.entity; -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.chisel.init.ModBlocks; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -11,6 +7,11 @@ import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.minecraft.chisel.init.ModBlocks; +import com.cricketcraft.minecraft.chisel.utils.General; + public class EntityBallOMoss extends EntityThrowable { diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java rename to src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java index 0144d928..9d7bf6e7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java @@ -1,6 +1,4 @@ -package info.jbcs.minecraft.chisel.entity; - -import info.jbcs.minecraft.chisel.init.ModBlocks; +package com.cricketcraft.minecraft.chisel.entity; import java.util.Random; @@ -9,6 +7,8 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.init.ModBlocks; + public class EntityCloudInABottle extends EntityThrowable { Random rand = new Random(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java b/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java rename to src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java index 656535e3..9357b963 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java @@ -1,6 +1,5 @@ -package info.jbcs.minecraft.chisel.entity; +package com.cricketcraft.minecraft.chisel.entity; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -8,6 +7,8 @@ import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.utils.General; + public class EntitySmashingRock extends EntityThrowable { diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java rename to src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java index 0efac068..9d927da4 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java @@ -1,8 +1,5 @@ -package info.jbcs.minecraft.chisel.entity.fx; +package com.cricketcraft.minecraft.chisel.entity.fx; -import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.chisel.init.ModItems; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; @@ -10,6 +7,10 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; +import com.cricketcraft.minecraft.chisel.init.ModItems; +import com.cricketcraft.minecraft.chisel.utils.General; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java similarity index 90% rename from src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java rename to src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java index 4f822557..ffd64d58 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.entity.fx; +package com.cricketcraft.minecraft.chisel.entity.fx; -import info.jbcs.minecraft.chisel.block.BlockGrimstone; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.block.BlockGrimstone; +import com.cricketcraft.minecraft.chisel.utils.General; + public class EntityGrimstoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java similarity index 90% rename from src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java rename to src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java index 5b7d9ba5..c7fc09b7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.entity.fx; +package com.cricketcraft.minecraft.chisel.entity.fx; -import info.jbcs.minecraft.chisel.block.BlockHolystone; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.block.BlockHolystone; +import com.cricketcraft.minecraft.chisel.utils.General; + public class EntityHolystoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java rename to src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 58fb6bf2..6c07e517 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -1,13 +1,14 @@ -package info.jbcs.minecraft.chisel.entity.fx; +package com.cricketcraft.minecraft.chisel.entity.fx; -import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; +import com.cricketcraft.minecraft.chisel.utils.General; + public class EntitySnakestoneObsidianFX extends EntityFX { BlockSnakestoneObsidian block; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java similarity index 90% rename from src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java rename to src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java index 6d903bfe..a01b1740 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.entity.fx; +package com.cricketcraft.minecraft.chisel.entity.fx; -import info.jbcs.minecraft.chisel.block.BlockVoidstone; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.block.BlockVoidstone; +import com.cricketcraft.minecraft.chisel.utils.General; + public class EntityVoidstoneFX extends EntityFX { static final float fadetime = 20F; diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java rename to src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java index 10fdb231..457ca1a0 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java @@ -1,51 +1,53 @@ -package info.jbcs.minecraft.chisel.init; +package com.cricketcraft.minecraft.chisel.init; -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.block.BlockAutoChisel; -import info.jbcs.minecraft.chisel.block.BlockBeaconBase; -import info.jbcs.minecraft.chisel.block.BlockCarvable; -import info.jbcs.minecraft.chisel.block.BlockCarvableGlass; -import info.jbcs.minecraft.chisel.block.BlockCarvablePane; -import info.jbcs.minecraft.chisel.block.BlockCarvablePowered; -import info.jbcs.minecraft.chisel.block.BlockCloud; -import info.jbcs.minecraft.chisel.block.BlockConcrete; -import info.jbcs.minecraft.chisel.block.BlockEldritch; -import info.jbcs.minecraft.chisel.block.BlockGrimstone; -import info.jbcs.minecraft.chisel.block.BlockHolystone; -import info.jbcs.minecraft.chisel.block.BlockLavastone; -import info.jbcs.minecraft.chisel.block.BlockLeaf; -import info.jbcs.minecraft.chisel.block.BlockLightstoneCarvable; -import info.jbcs.minecraft.chisel.block.BlockMarbleBookshelf; -import info.jbcs.minecraft.chisel.block.BlockMarbleCarpet; -import info.jbcs.minecraft.chisel.block.BlockMarbleIce; -import info.jbcs.minecraft.chisel.block.BlockMarbleIceStairs; -import info.jbcs.minecraft.chisel.block.BlockMarblePillar; -import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; -import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; -import info.jbcs.minecraft.chisel.block.BlockMarbleStairsMaker; -import info.jbcs.minecraft.chisel.block.BlockMarbleStairsMakerCreator; -import info.jbcs.minecraft.chisel.block.BlockMarbleWall; -import info.jbcs.minecraft.chisel.block.BlockPresent; -import info.jbcs.minecraft.chisel.block.BlockRoadLine; -import info.jbcs.minecraft.chisel.block.BlockSnakestone; -import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.chisel.block.BlockSpikes; -import info.jbcs.minecraft.chisel.block.BlockVoidstone; -import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar; -import info.jbcs.minecraft.chisel.block.BlockWaterstone; -import info.jbcs.minecraft.chisel.block.ItemBlockAutoChisel; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.carving.Carving; -import info.jbcs.minecraft.chisel.item.ItemCarvable; -import info.jbcs.minecraft.chisel.item.ItemMarbleSlab; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; + +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.Configurations; +import com.cricketcraft.minecraft.chisel.block.BlockAutoChisel; +import com.cricketcraft.minecraft.chisel.block.BlockBeaconBase; +import com.cricketcraft.minecraft.chisel.block.BlockCarvable; +import com.cricketcraft.minecraft.chisel.block.BlockCarvableGlass; +import com.cricketcraft.minecraft.chisel.block.BlockCarvablePane; +import com.cricketcraft.minecraft.chisel.block.BlockCarvablePowered; +import com.cricketcraft.minecraft.chisel.block.BlockCloud; +import com.cricketcraft.minecraft.chisel.block.BlockConcrete; +import com.cricketcraft.minecraft.chisel.block.BlockEldritch; +import com.cricketcraft.minecraft.chisel.block.BlockGrimstone; +import com.cricketcraft.minecraft.chisel.block.BlockHolystone; +import com.cricketcraft.minecraft.chisel.block.BlockLavastone; +import com.cricketcraft.minecraft.chisel.block.BlockLeaf; +import com.cricketcraft.minecraft.chisel.block.BlockLightstoneCarvable; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleBookshelf; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleCarpet; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleIce; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleIceStairs; +import com.cricketcraft.minecraft.chisel.block.BlockMarblePillar; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairs; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairsMaker; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairsMakerCreator; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleWall; +import com.cricketcraft.minecraft.chisel.block.BlockPresent; +import com.cricketcraft.minecraft.chisel.block.BlockRoadLine; +import com.cricketcraft.minecraft.chisel.block.BlockSnakestone; +import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; +import com.cricketcraft.minecraft.chisel.block.BlockSpikes; +import com.cricketcraft.minecraft.chisel.block.BlockVoidstone; +import com.cricketcraft.minecraft.chisel.block.BlockVoidstonePillar; +import com.cricketcraft.minecraft.chisel.block.BlockWaterstone; +import com.cricketcraft.minecraft.chisel.block.ItemBlockAutoChisel; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.carving.Carving; +import com.cricketcraft.minecraft.chisel.item.ItemCarvable; +import com.cricketcraft.minecraft.chisel.item.ItemMarbleSlab; + import cpw.mods.fml.common.registry.GameRegistry; public class ModBlocks { diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java b/src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java similarity index 75% rename from src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java rename to src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java index 81278be6..682ff1a9 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java @@ -1,15 +1,16 @@ -package info.jbcs.minecraft.chisel.init; +package com.cricketcraft.minecraft.chisel.init; + +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.Configurations; +import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; +import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; +import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; +import com.cricketcraft.minecraft.chisel.item.ItemBallOMoss; +import com.cricketcraft.minecraft.chisel.item.ItemChisel; +import com.cricketcraft.minecraft.chisel.item.ItemCloudInABottle; +import com.cricketcraft.minecraft.chisel.item.ItemSmashingRock; +import com.cricketcraft.minecraft.chisel.item.ItemUpgrade; -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; -import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; -import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; -import info.jbcs.minecraft.chisel.item.ItemBallOMoss; -import info.jbcs.minecraft.chisel.item.ItemChisel; -import info.jbcs.minecraft.chisel.item.ItemCloudInABottle; -import info.jbcs.minecraft.chisel.item.ItemSmashingRock; -import info.jbcs.minecraft.chisel.item.ItemUpgrade; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java b/src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java rename to src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java index 7c0fef9d..a4f1275b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.init; +package com.cricketcraft.minecraft.chisel.init; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java index 2ea78121..aafd0e80 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java @@ -1,12 +1,13 @@ -package info.jbcs.minecraft.chisel.inventory; +package com.cricketcraft.minecraft.chisel.inventory; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; + public class ContainerAutoChisel extends Container { public static TileEntityAutoChisel autoChisel; @@ -14,7 +15,7 @@ public class ContainerAutoChisel extends Container { public ContainerAutoChisel(InventoryPlayer player, TileEntityAutoChisel tileEntityAutoChisel) { - this.player = player.player; + ContainerAutoChisel.player = player.player; autoChisel = tileEntityAutoChisel; addSlotToContainer(new Slot(tileEntityAutoChisel, 0, 53, 15)); diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java index dff2f7b0..f022ed77 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java @@ -1,8 +1,5 @@ -package info.jbcs.minecraft.chisel.inventory; +package com.cricketcraft.minecraft.chisel.inventory; -import info.jbcs.minecraft.chisel.carving.Carving; -import info.jbcs.minecraft.chisel.item.ItemChisel; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -11,6 +8,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import com.cricketcraft.minecraft.chisel.carving.Carving; +import com.cricketcraft.minecraft.chisel.item.ItemChisel; +import com.cricketcraft.minecraft.chisel.utils.General; + public class ContainerChisel extends Container { public final InventoryChiselSelection inventory; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java index eee7e9ca..45ce6585 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.inventory; +package com.cricketcraft.minecraft.chisel.inventory; import net.minecraft.inventory.ContainerChest; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java rename to src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java index d77cff9e..77331a4c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java @@ -1,6 +1,4 @@ -package info.jbcs.minecraft.chisel.inventory; - -import info.jbcs.minecraft.chisel.item.ItemChisel; +package com.cricketcraft.minecraft.chisel.inventory; import java.util.ArrayList; @@ -10,6 +8,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.cricketcraft.minecraft.chisel.item.ItemChisel; + public class InventoryChiselSelection implements IInventory { ItemStack chisel = null; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java rename to src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java index 3cac0ee4..d729ee01 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.inventory; +package com.cricketcraft.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java rename to src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java index 31e6d595..85928f9e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.inventory; +package com.cricketcraft.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java index 08875d62..09e1649c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.inventory; +package com.cricketcraft.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java rename to src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java index b9a82192..112cba2c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.inventory; +package com.cricketcraft.minecraft.chisel.inventory; -import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.cricketcraft.minecraft.chisel.utils.General; + public class SlotChiselSelection extends Slot { public SlotChiselSelection(ContainerChisel container, InventoryChiselSelection inv, IInventory iinventory, int i, int j, int k) @@ -60,7 +61,7 @@ public class SlotChiselSelection extends Slot String sound = container.carving.getVariationSound(itemstack.getItem(), itemstack.getItemDamage()); player.worldObj.playSoundAtEntity(player, sound, 0.3f + 0.7f * General.rand.nextFloat(), 0.6f + 0.4f * General.rand.nextFloat()); - + /* ItemStack stack=player.inventory.getItemStack(); putStack(new ItemStack(itemstack.itemID, itemstack.stackSize, itemstack.getItemDamage())); diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java similarity index 88% rename from src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java rename to src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java index 908ac98c..e50f111b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.item; +package com.cricketcraft.minecraft.chisel.item; -import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; + public class ItemBallOMoss extends Item { diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java similarity index 81% rename from src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java rename to src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java index b72de686..42f8d2ca 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java @@ -1,9 +1,4 @@ -package info.jbcs.minecraft.chisel.item; - -import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.utils.General; +package com.cricketcraft.minecraft.chisel.item; import java.util.List; @@ -14,6 +9,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import com.cricketcraft.minecraft.chisel.Configurations; +import com.cricketcraft.minecraft.chisel.api.ICarvable; +import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; +import com.cricketcraft.minecraft.chisel.utils.General; + public class ItemCarvable extends ItemBlock { diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java similarity index 78% rename from src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java rename to src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java index 4bed6b23..27d0d99f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java @@ -1,10 +1,4 @@ -package info.jbcs.minecraft.chisel.item; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.api.ChiselMode; -import info.jbcs.minecraft.chisel.api.IChiselMode; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.Carving; +package com.cricketcraft.minecraft.chisel.item; import java.util.HashSet; import java.util.Set; @@ -14,6 +8,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.api.ChiselMode; +import com.cricketcraft.minecraft.chisel.api.IChiselMode; +import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; +import com.cricketcraft.minecraft.chisel.carving.Carving; + public class ItemChisel extends ItemTool implements IChiselMode { private static final HashSet toolSet = new HashSet(); public static Carving carving = Carving.chisel; diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java similarity index 88% rename from src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java rename to src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java index 0ecfa8a1..6c734110 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.item; +package com.cricketcraft.minecraft.chisel.item; -import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; + public class ItemCloudInABottle extends Item { diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java rename to src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java index 5b7724a6..14dcb453 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java @@ -1,12 +1,13 @@ -package info.jbcs.minecraft.chisel.item; +package com.cricketcraft.minecraft.chisel.item; -import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; + public class ItemMarbleSlab extends ItemCarvable { diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java similarity index 88% rename from src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java rename to src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java index b744dfb3..ee0fee66 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java @@ -1,11 +1,12 @@ -package info.jbcs.minecraft.chisel.item; +package com.cricketcraft.minecraft.chisel.item; -import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; + public class ItemSmashingRock extends Item { diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java similarity index 92% rename from src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java rename to src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java index f25e73e7..a02f08b0 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java @@ -1,7 +1,4 @@ -package info.jbcs.minecraft.chisel.item; - -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +package com.cricketcraft.minecraft.chisel.item; import java.util.List; @@ -15,6 +12,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.cricketcraft.minecraft.chisel.Chisel; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; + public class ItemUpgrade extends Item{ public IIcon[] icons = new IIcon[6]; diff --git a/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java similarity index 55% rename from src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java rename to src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java index df990b86..afe53001 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java @@ -1,31 +1,33 @@ -package info.jbcs.minecraft.chisel.proxy; +package com.cricketcraft.minecraft.chisel.proxy; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; -import info.jbcs.minecraft.chisel.client.render.BlockAdvancedMarbleRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockCarpetRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockEldritchRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockMarblePaneRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockMarblePillarRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockNoCTMRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; -import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer; -import info.jbcs.minecraft.chisel.client.render.item.ItemAutoChiselRenderer; -import info.jbcs.minecraft.chisel.client.render.item.ItemChiselRenderer; -import info.jbcs.minecraft.chisel.client.render.item.ItemPresentRenderer; -import info.jbcs.minecraft.chisel.client.render.tile.RenderAutoChisel; -import info.jbcs.minecraft.chisel.client.render.tile.RenderPresent; -import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; -import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; -import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; -import info.jbcs.minecraft.chisel.init.ModBlocks; -import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; + +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; +import com.cricketcraft.minecraft.chisel.client.render.BlockAdvancedMarbleRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockCarpetRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockEldritchRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePaneRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePillarRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockMarbleStairsRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockNoCTMRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockRoadLineRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockSnakeStoneRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockSpikesRenderer; +import com.cricketcraft.minecraft.chisel.client.render.BlockTexturedOreRenderer; +import com.cricketcraft.minecraft.chisel.client.render.item.ItemAutoChiselRenderer; +import com.cricketcraft.minecraft.chisel.client.render.item.ItemChiselRenderer; +import com.cricketcraft.minecraft.chisel.client.render.item.ItemPresentRenderer; +import com.cricketcraft.minecraft.chisel.client.render.tile.RenderAutoChisel; +import com.cricketcraft.minecraft.chisel.client.render.tile.RenderPresent; +import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; +import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; +import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; +import com.cricketcraft.minecraft.chisel.init.ModBlocks; +import com.cricketcraft.minecraft.chisel.init.ModItems; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java b/src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java similarity index 64% rename from src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java rename to src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java index c4dde346..040953c0 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java @@ -1,7 +1,8 @@ -package info.jbcs.minecraft.chisel.proxy; +package com.cricketcraft.minecraft.chisel.proxy; + +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java b/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java rename to src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java index f1522da7..78ee24b9 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.utils; +package com.cricketcraft.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java b/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java index a00a22b7..23ef0aa0 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.utils; +package com.cricketcraft.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java b/src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java rename to src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java index 881f8fc8..341b5e20 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.utils; +package com.cricketcraft.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java b/src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java similarity index 83% rename from src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java rename to src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java index 57dbac59..a12abb7c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.utils; +package com.cricketcraft.minecraft.chisel.utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/General.java b/src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/chisel/utils/General.java rename to src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java index 4bc6dedd..c4880673 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/General.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.utils; +package com.cricketcraft.minecraft.chisel.utils; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java b/src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java rename to src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java index 4c1bccc8..50e99239 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.utils; +package com.cricketcraft.minecraft.chisel.utils; import java.util.HashMap; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java b/src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java rename to src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java index d5532d7a..83c33041 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.utils; +package com.cricketcraft.minecraft.chisel.utils; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java b/src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java similarity index 92% rename from src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java rename to src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java index 5874d40f..5b18d9c2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.utils; +package com.cricketcraft.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java b/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java rename to src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java index 7e809401..b2270f00 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.world; +package com.cricketcraft.minecraft.chisel.world; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java b/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java similarity index 95% rename from src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java rename to src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java index 1916fa8b..97ea6844 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java +++ b/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.world; +package com.cricketcraft.minecraft.chisel.world; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java b/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java deleted file mode 100644 index 9f42de61..00000000 --- a/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java +++ /dev/null @@ -1,8 +0,0 @@ -package info.jbcs.minecraft.chisel.api; - -import info.jbcs.minecraft.chisel.carving.CarvableVariation; - -public interface ICarvable -{ - public CarvableVariation getVariation(int metadata); -} From c5edcf2f0c6fc26ee4f00aada6431fcd737f86e9 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 14 Dec 2014 23:49:01 +0000 Subject: [PATCH 3/3] Revert "Update the package name" This reverts commit 0871831c46a2bb4eb82cfc914e83a412417dba98. --- .../minecraft/chisel/api/ICarvable.java | 8 -- .../minecraft/chisel/BlockNameConversion.java | 7 +- .../jbcs}/minecraft/chisel/Chisel.java | 53 ++++++------ .../minecraft/chisel/ChiselLeftClick.java | 17 ++-- .../minecraft/chisel/Configurations.java | 2 +- .../jbcs}/minecraft/chisel/Crafting.java | 8 +- .../jbcs}/minecraft/chisel/Packets.java | 2 +- .../jbcs}/minecraft/chisel/Waila.java | 6 +- .../minecraft/chisel/api/ChiselMode.java | 2 +- .../jbcs/minecraft/chisel/api/ICarvable.java | 8 ++ .../minecraft/chisel/api/IChiselMode.java | 2 +- .../jbcs}/minecraft/chisel/api/IFacade.java | 2 +- .../chisel/block/BlockAutoChisel.java | 13 ++- .../chisel/block/BlockBeaconBase.java | 2 +- .../minecraft/chisel/block/BlockCarvable.java | 15 ++-- .../chisel/block/BlockCarvableGlass.java | 15 ++-- .../chisel/block/BlockCarvablePane.java | 15 ++-- .../chisel/block/BlockCarvablePowered.java | 2 +- .../chisel/block/BlockCarvablePumpkin.java | 10 +-- .../minecraft/chisel/block/BlockCloud.java | 6 +- .../minecraft/chisel/block/BlockConcrete.java | 8 +- .../minecraft/chisel/block/BlockEldritch.java | 4 +- .../chisel/block/BlockGrimstone.java | 12 +-- .../chisel/block/BlockHolystone.java | 8 +- .../chisel/block/BlockLavastone.java | 6 +- .../minecraft/chisel/block/BlockLeaf.java | 2 +- .../chisel/block/BlockLightstoneCarvable.java | 2 +- .../chisel/block/BlockMarbleBookshelf.java | 2 +- .../chisel/block/BlockMarbleCarpet.java | 14 ++-- .../chisel/block/BlockMarbleIce.java | 12 +-- .../chisel/block/BlockMarbleIceStairs.java | 8 +- .../chisel/block/BlockMarbleLamp.java | 2 +- .../chisel/block/BlockMarblePillar.java | 7 +- .../chisel/block/BlockMarbleSlab.java | 2 +- .../chisel/block/BlockMarbleStairs.java | 14 ++-- .../chisel/block/BlockMarbleStairsMaker.java | 10 +-- .../block/BlockMarbleStairsMakerCreator.java | 5 +- .../chisel/block/BlockMarbleTexturedOre.java | 12 +-- .../chisel/block/BlockMarbleWall.java | 8 +- .../minecraft/chisel/block/BlockPresent.java | 24 +++--- .../minecraft/chisel/block/BlockRoadLine.java | 9 +- .../chisel/block/BlockSnakestone.java | 8 +- .../chisel/block/BlockSnakestoneObsidian.java | 6 +- .../minecraft/chisel/block/BlockSpikes.java | 12 ++- .../chisel/block/BlockTexturedOre.java | 6 +- .../chisel/block/BlockVoidstone.java | 16 ++-- .../chisel/block/BlockVoidstonePillar.java | 11 ++- .../chisel/block/BlockWaterstone.java | 2 +- .../chisel/block/ItemBlockAutoChisel.java | 2 +- .../tileentity/TileEntityAutoChisel.java | 2 +- .../block/tileentity/TileEntityPresent.java | 10 +-- .../chisel/carving/CarvableHelper.java | 21 +++-- .../chisel/carving/CarvableVariation.java | 5 +- .../minecraft/chisel/carving/Carving.java | 6 +- .../chisel/carving/CarvingGroup.java | 2 +- .../chisel/carving/CarvingVariation.java | 2 +- .../chisel/client/GeneralChiselClient.java | 28 +++---- .../chisel/client/gui/GuiAutoChisel.java | 7 +- .../chisel/client/gui/GuiChisel.java | 9 +- .../chisel/client/gui/GuiChiselConfig.java | 8 +- .../minecraft/chisel/client/gui/GuiEdit.java | 2 +- .../chisel/client/gui/GuiElement.java | 2 +- .../chisel/client/gui/GuiExButton.java | 2 +- .../chisel/client/gui/GuiFactory.java | 2 +- .../minecraft/chisel/client/gui/GuiLabel.java | 2 +- .../chisel/client/gui/GuiPresent.java | 7 +- .../chisel/client/gui/GuiScreenPlus.java | 7 +- .../chisel/client/gui/GuilScrolledBox.java | 2 +- .../chisel/client/gui/InputEvent.java | 2 +- .../chisel/client/gui/InputKeyboardEvent.java | 2 +- .../chisel/client/gui/InputMouseEvent.java | 2 +- .../chisel/client/gui/Scrollbar.java | 5 +- .../chisel/client/gui/TexturedBox.java | 2 +- .../chisel/client/model/ModelAutoChisel.java | 5 +- .../render/BlockAdvancedMarbleRenderer.java | 13 ++- .../client/render/BlockCarpetRenderer.java | 5 +- .../client/render/BlockEldritchRenderer.java | 25 +++--- .../render/BlockMarblePaneRenderer.java | 5 +- .../render/BlockMarblePillarRenderer.java | 9 +- .../render/BlockMarbleStairsRenderer.java | 7 +- .../client/render/BlockNoCTMRenderer.java | 5 +- .../client/render/BlockRoadLineRenderer.java | 8 +- .../render/BlockSnakeStoneRenderer.java | 7 +- .../client/render/BlockSpikesRenderer.java | 9 +- .../render/BlockTexturedOreRenderer.java | 7 +- .../minecraft/chisel/client/render/CTM.java | 5 +- .../chisel/client/render/RenderBlocksCTM.java | 2 +- .../client/render/RenderBlocksCTMCarpet.java | 2 +- .../client/render/RenderBlocksColumn.java | 2 +- .../client/render/RenderBlocksEldritch.java | 2 +- .../chisel/client/render/TextureSubmap.java | 2 +- .../chisel/client/render/TextureVirtual.java | 2 +- .../render/item/ItemAutoChiselRenderer.java | 5 +- .../render/item/ItemChiselRenderer.java | 2 +- .../render/item/ItemPresentRenderer.java | 5 +- .../client/render/tile/RenderAutoChisel.java | 7 +- .../client/render/tile/RenderPresent.java | 9 +- .../chisel/compat/Compatibility.java | 7 +- .../chisel/compat/FMPIntegration.java | 8 +- .../chisel/compat/MarbleCompatibility.java | 6 +- .../chisel/compat/ModIntegration.java | 2 +- .../chisel/entity/EntityBallOMoss.java | 11 ++- .../chisel/entity/EntityCloudInABottle.java | 6 +- .../chisel/entity/EntitySmashingRock.java | 5 +- .../chisel/entity/fx/EntityBallOMossFX.java | 9 +- .../chisel/entity/fx/EntityGrimstoneFX.java | 7 +- .../chisel/entity/fx/EntityHolystoneFX.java | 7 +- .../entity/fx/EntitySnakestoneObsidianFX.java | 7 +- .../chisel/entity/fx/EntityVoidstoneFX.java | 7 +- .../minecraft/chisel/init/ModBlocks.java | 84 +++++++++---------- .../jbcs}/minecraft/chisel/init/ModItems.java | 23 +++-- .../jbcs}/minecraft/chisel/init/ModTabs.java | 2 +- .../chisel/inventory/ContainerAutoChisel.java | 7 +- .../chisel/inventory/ContainerChisel.java | 9 +- .../chisel/inventory/ContainerPresent.java | 2 +- .../inventory/InventoryChiselSelection.java | 6 +- .../inventory/InventoryLargePresent.java | 2 +- .../chisel/inventory/SlotChiselInput.java | 2 +- .../chisel/inventory/SlotChiselPlayer.java | 2 +- .../chisel/inventory/SlotChiselSelection.java | 7 +- .../minecraft/chisel/item/ItemBallOMoss.java | 5 +- .../minecraft/chisel/item/ItemCarvable.java | 12 +-- .../minecraft/chisel/item/ItemChisel.java | 14 ++-- .../chisel/item/ItemCloudInABottle.java | 5 +- .../minecraft/chisel/item/ItemMarbleSlab.java | 5 +- .../chisel/item/ItemSmashingRock.java | 5 +- .../minecraft/chisel/item/ItemUpgrade.java | 8 +- .../minecraft/chisel/proxy/ClientProxy.java | 50 ++++++----- .../minecraft/chisel/proxy/CommonProxy.java | 7 +- .../chisel/utils/BlockTexturedOre.java | 2 +- .../utils/BlockTexturedOreRenderer.java | 2 +- .../jbcs}/minecraft/chisel/utils/Drawing.java | 2 +- .../chisel/utils/DummyContainer.java | 2 +- .../jbcs}/minecraft/chisel/utils/General.java | 2 +- .../minecraft/chisel/utils/GeneralClient.java | 2 +- .../minecraft/chisel/utils/GuiHandler.java | 2 +- .../minecraft/chisel/utils/ItemMetaBlock.java | 2 +- .../chisel/world/GeneratorLimestone.java | 2 +- .../chisel/world/GeneratorMarble.java | 2 +- 139 files changed, 500 insertions(+), 577 deletions(-) delete mode 100644 src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/BlockNameConversion.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/Chisel.java (79%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/ChiselLeftClick.java (94%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/Configurations.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/Crafting.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/Packets.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/Waila.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/api/ChiselMode.java (63%) create mode 100644 src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/api/IChiselMode.java (73%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/api/IFacade.java (84%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockAutoChisel.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockBeaconBase.java (85%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockCarvable.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockCarvableGlass.java (83%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockCarvablePane.java (81%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockCarvablePowered.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockCarvablePumpkin.java (84%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockCloud.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockConcrete.java (84%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockEldritch.java (68%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockGrimstone.java (75%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockHolystone.java (82%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockLavastone.java (84%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockLeaf.java (83%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockLightstoneCarvable.java (92%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleBookshelf.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleCarpet.java (81%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleIce.java (87%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleIceStairs.java (86%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleLamp.java (97%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarblePillar.java (81%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleSlab.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleStairs.java (88%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleStairsMaker.java (87%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java (59%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleTexturedOre.java (83%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockMarbleWall.java (86%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockPresent.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockRoadLine.java (85%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockSnakestone.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockSnakestoneObsidian.java (87%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockSpikes.java (85%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockTexturedOre.java (89%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockVoidstone.java (72%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockVoidstonePillar.java (79%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/BlockWaterstone.java (85%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/ItemBlockAutoChisel.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java (99%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/block/tileentity/TileEntityPresent.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/carving/CarvableHelper.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/carving/CarvableVariation.java (84%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/carving/Carving.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/carving/CarvingGroup.java (84%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/carving/CarvingVariation.java (90%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/GeneralChiselClient.java (92%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiAutoChisel.java (80%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiChisel.java (87%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiChiselConfig.java (76%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiEdit.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiElement.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiExButton.java (97%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiFactory.java (92%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiLabel.java (88%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiPresent.java (85%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuiScreenPlus.java (97%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/GuilScrolledBox.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/InputEvent.java (51%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/InputKeyboardEvent.java (65%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/InputMouseEvent.java (78%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/Scrollbar.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/gui/TexturedBox.java (97%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/model/ModelAutoChisel.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java (87%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockCarpetRenderer.java (79%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockEldritchRenderer.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockMarblePaneRenderer.java (99%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockMarblePillarRenderer.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java (89%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockNoCTMRenderer.java (92%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockRoadLineRenderer.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockSpikesRenderer.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/BlockTexturedOreRenderer.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/CTM.java (99%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/RenderBlocksCTM.java (99%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/RenderBlocksColumn.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/RenderBlocksEldritch.java (99%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/TextureSubmap.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/TextureVirtual.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/item/ItemChiselRenderer.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/item/ItemPresentRenderer.java (94%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/tile/RenderAutoChisel.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/client/render/tile/RenderPresent.java (94%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/compat/Compatibility.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/compat/FMPIntegration.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/compat/MarbleCompatibility.java (97%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/compat/ModIntegration.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/entity/EntityBallOMoss.java (91%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/entity/EntityCloudInABottle.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/entity/EntitySmashingRock.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/entity/fx/EntityBallOMossFX.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/entity/fx/EntityGrimstoneFX.java (90%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/entity/fx/EntityHolystoneFX.java (90%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java (94%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/entity/fx/EntityVoidstoneFX.java (90%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/init/ModBlocks.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/init/ModItems.java (75%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/init/ModTabs.java (93%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/inventory/ContainerAutoChisel.java (94%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/inventory/ContainerChisel.java (94%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/inventory/ContainerPresent.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/inventory/InventoryChiselSelection.java (97%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/inventory/InventoryLargePresent.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/inventory/SlotChiselInput.java (94%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/inventory/SlotChiselPlayer.java (94%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/inventory/SlotChiselSelection.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/item/ItemBallOMoss.java (88%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/item/ItemCarvable.java (81%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/item/ItemChisel.java (78%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/item/ItemCloudInABottle.java (88%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/item/ItemMarbleSlab.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/item/ItemSmashingRock.java (88%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/item/ItemUpgrade.java (92%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/proxy/ClientProxy.java (55%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/proxy/CommonProxy.java (64%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/utils/BlockTexturedOre.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/utils/BlockTexturedOreRenderer.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/utils/Drawing.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/utils/DummyContainer.java (83%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/utils/General.java (98%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/utils/GeneralClient.java (96%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/utils/GuiHandler.java (97%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/utils/ItemMetaBlock.java (92%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/world/GeneratorLimestone.java (95%) rename src/main/java/{com/cricketcraft => info/jbcs}/minecraft/chisel/world/GeneratorMarble.java (95%) diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java deleted file mode 100644 index 6bc5c312..00000000 --- a/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.cricketcraft.minecraft.chisel.api; - -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; - -public interface ICarvable -{ - public CarvableVariation getVariation(int metadata); -} diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java rename to src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java index 02548e87..d3bacc48 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java +++ b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; + +import info.jbcs.minecraft.chisel.utils.General; import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.item.Item; - -import com.cricketcraft.minecraft.chisel.utils.General; - import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java similarity index 79% rename from src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java rename to src/main/java/info/jbcs/minecraft/chisel/Chisel.java index a2a4beae..9c79d11d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -1,4 +1,25 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; + +import info.jbcs.minecraft.chisel.block.BlockCarvable; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel; +import info.jbcs.minecraft.chisel.client.gui.GuiChisel; +import info.jbcs.minecraft.chisel.client.gui.GuiPresent; +import info.jbcs.minecraft.chisel.compat.Compatibility; +import info.jbcs.minecraft.chisel.compat.FMPIntegration; +import info.jbcs.minecraft.chisel.compat.ModIntegration; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; +import info.jbcs.minecraft.chisel.init.ModTabs; +import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel; +import info.jbcs.minecraft.chisel.inventory.ContainerChisel; +import info.jbcs.minecraft.chisel.inventory.ContainerPresent; +import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; +import info.jbcs.minecraft.chisel.proxy.CommonProxy; +import info.jbcs.minecraft.chisel.utils.General; +import info.jbcs.minecraft.chisel.world.GeneratorLimestone; +import info.jbcs.minecraft.chisel.world.GeneratorMarble; import java.io.File; @@ -9,28 +30,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; - -import com.cricketcraft.minecraft.chisel.block.BlockCarvable; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.minecraft.chisel.client.gui.GuiAutoChisel; -import com.cricketcraft.minecraft.chisel.client.gui.GuiChisel; -import com.cricketcraft.minecraft.chisel.client.gui.GuiPresent; -import com.cricketcraft.minecraft.chisel.compat.Compatibility; -import com.cricketcraft.minecraft.chisel.compat.FMPIntegration; -import com.cricketcraft.minecraft.chisel.compat.ModIntegration; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; -import com.cricketcraft.minecraft.chisel.init.ModTabs; -import com.cricketcraft.minecraft.chisel.inventory.ContainerAutoChisel; -import com.cricketcraft.minecraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; -import com.cricketcraft.minecraft.chisel.inventory.InventoryChiselSelection; -import com.cricketcraft.minecraft.chisel.proxy.CommonProxy; -import com.cricketcraft.minecraft.chisel.utils.General; -import com.cricketcraft.minecraft.chisel.world.GeneratorLimestone; -import com.cricketcraft.minecraft.chisel.world.GeneratorMarble; - import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; @@ -53,11 +52,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") +@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") public class Chisel { public static final String MOD_ID = "chisel"; - public static final BlockCarvable.SoundType soundTempleFootstep = new com.cricketcraft.minecraft.chisel.block.BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f); + public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f); public static final String MOD_NAME = "Chisel 2"; public static final String VERSION = "2.1.3"; public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f); @@ -70,7 +69,7 @@ public class Chisel @Instance(MOD_ID) public static Chisel instance; - @SidedProxy(clientSide = "com.cricketcraft.minecraft.chisel.proxy.ClientProxy", serverSide = "com.cricketcraft.minecraft.chisel.proxy.CommonProxy") + @SidedProxy(clientSide = "info.jbcs.minecraft.chisel.proxy.ClientProxy", serverSide = "info.jbcs.minecraft.chisel.proxy.CommonProxy") public static CommonProxy proxy; @SideOnly(Side.CLIENT) @@ -186,7 +185,7 @@ public class Chisel MinecraftForge.EVENT_BUS.register(new ChiselLeftClick()); FMLCommonHandler.instance().bus().register(instance); - FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.minecraft.chisel.Waila.register"); + FMLInterModComms.sendMessage("Waila", "register", "info.jbcs.minecraft.chisel.Waila.register"); } @EventHandler diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java rename to src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java index 2a84c318..4d8b442f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java @@ -1,4 +1,11 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; + +import info.jbcs.minecraft.chisel.api.ChiselMode; +import info.jbcs.minecraft.chisel.carving.CarvingVariation; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; +import info.jbcs.minecraft.chisel.item.ItemChisel; import java.util.HashMap; import java.util.Random; @@ -12,14 +19,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; - -import com.cricketcraft.minecraft.chisel.api.ChiselMode; -import com.cricketcraft.minecraft.chisel.carving.CarvingVariation; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; -import com.cricketcraft.minecraft.chisel.item.ItemChisel; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java b/src/main/java/info/jbcs/minecraft/chisel/Configurations.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java rename to src/main/java/info/jbcs/minecraft/chisel/Configurations.java index 7d9ad0cc..2918f600 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Configurations.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; import net.minecraftforge.common.config.Configuration; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java rename to src/main/java/info/jbcs/minecraft/chisel/Crafting.java index fd381add..b2bd25c4 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -8,10 +10,6 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; - -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; - import cpw.mods.fml.common.registry.GameRegistry; public class Crafting { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Packets.java b/src/main/java/info/jbcs/minecraft/chisel/Packets.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/Packets.java rename to src/main/java/info/jbcs/minecraft/chisel/Packets.java index bb663f29..abe3899c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Packets.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Packets.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; public class Packets// extends MessageHandlerBase { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Waila.java b/src/main/java/info/jbcs/minecraft/chisel/Waila.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/Waila.java rename to src/main/java/info/jbcs/minecraft/chisel/Waila.java index 6bbe52aa..caed69eb 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Waila.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Waila.java @@ -1,4 +1,6 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; + +import info.jbcs.minecraft.chisel.block.BlockCarvable; import java.util.List; @@ -8,8 +10,6 @@ import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import net.minecraft.item.ItemStack; -import com.cricketcraft.minecraft.chisel.block.BlockCarvable; - public class Waila implements IWailaDataProvider { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java b/src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java similarity index 63% rename from src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java rename to src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java index e24651bc..186803e6 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java +++ b/src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.api; +package info.jbcs.minecraft.chisel.api; public enum ChiselMode { diff --git a/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java b/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java new file mode 100644 index 00000000..9f42de61 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java @@ -0,0 +1,8 @@ +package info.jbcs.minecraft.chisel.api; + +import info.jbcs.minecraft.chisel.carving.CarvableVariation; + +public interface ICarvable +{ + public CarvableVariation getVariation(int metadata); +} diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java b/src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java similarity index 73% rename from src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java rename to src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java index dc610112..1e86535f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java +++ b/src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.api; +package info.jbcs.minecraft.chisel.api; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java b/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java rename to src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java index f104c364..de49cf38 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java +++ b/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.api; +package info.jbcs.minecraft.chisel.api; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java index 14e390b8..8899a5aa 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; import java.util.List; import java.util.Random; @@ -14,12 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java index 2294de03..ee889ea5 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java index b2dd4126..30d565f3 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -9,13 +15,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java similarity index 83% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java index 0297acc5..489fa921 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -8,13 +14,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java similarity index 81% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java index 69dc0b15..2aa8627d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.client.render.BlockMarblePaneRenderer; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -8,13 +14,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; - -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePaneRenderer; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java index 4d36d58c..97864ce2 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java index b8367422..301452c0 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java @@ -1,13 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; import net.minecraft.block.BlockPumpkin; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java index 3d84d354..391b10ee 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java @@ -1,6 +1,8 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.Configurations; + import java.util.Random; import net.minecraft.block.material.Material; @@ -10,8 +12,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Configurations; - public class BlockCloud extends BlockCarvable { public BlockCloud() { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java index 5e06a332..8d5e6f65 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java @@ -1,12 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java similarity index 68% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java index 6134ec7a..32d47a1f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java @@ -1,6 +1,6 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; -import com.cricketcraft.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Chisel; public class BlockEldritch extends BlockCarvable diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java similarity index 75% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java index d52ef090..30ce6540 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.init.ModTabs; +import info.jbcs.minecraft.chisel.utils.General; import java.util.Random; @@ -7,11 +12,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.init.ModTabs; -import com.cricketcraft.minecraft.chisel.utils.General; - public class BlockGrimstone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java similarity index 82% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java index 2625b84e..359a6e0c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.utils.General; import java.util.Random; @@ -7,9 +10,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.utils.General; - public class BlockHolystone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java index 13f7fe3a..d5a74dca 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java @@ -1,13 +1,13 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; + import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; - public class BlockLavastone extends BlockMarbleTexturedOre { public BlockLavastone(Material mat, String baseIcon) diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java similarity index 83% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java index d7ccef65..d32db7ec 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java index b516fb67..2bd4af4f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java index 13df7981..60faf177 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java similarity index 81% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java index 3e154cc1..006a081c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -10,12 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleCarpet extends BlockCarpet implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java index a548fed8..ebad141a 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -12,11 +17,6 @@ import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleIce extends BlockIce implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java similarity index 86% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java index c9d4558e..e1b8262b 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.init.ModBlocks; import java.util.Random; @@ -6,9 +9,6 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; - public class BlockMarbleIceStairs extends BlockMarbleStairs { public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper) diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java index caebac85..335ef726 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java similarity index 81% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java index ad1a660d..029fa4d5 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.client.render.BlockMarblePillarRenderer; import net.minecraft.block.material.Material; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePillarRenderer; - public class BlockMarblePillar extends BlockCarvable { public IIcon sides[] = new IIcon[6]; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java index 0cc9b46c..e0df6d64 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java index b0da3649..9e538780 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -13,12 +19,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarbleStairsRenderer; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleStairs extends BlockStairs implements ICarvable { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java index ec1b76a9..9a29b102 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java @@ -1,13 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.item.ItemCarvable; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; - -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.item.ItemCarvable; - import cpw.mods.fml.common.registry.GameRegistry; public class BlockMarbleStairsMaker diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java similarity index 59% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java index f242cae8..418cfe2e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java @@ -1,9 +1,8 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; import net.minecraft.block.Block; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; - public interface BlockMarbleStairsMakerCreator { public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java similarity index 83% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java index 7fdb2578..b11d2d32 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -9,11 +14,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java similarity index 86% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java index 25c34399..67c0bf0b 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -9,9 +12,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleWall extends BlockWall { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java index 8dd8cd6e..9d00a212 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java @@ -1,4 +1,12 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; +import info.jbcs.minecraft.chisel.inventory.InventoryLargePresent; import java.util.Calendar; import java.util.Iterator; @@ -24,15 +32,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; -import com.cricketcraft.minecraft.chisel.inventory.InventoryLargePresent; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -391,14 +390,13 @@ public class BlockPresent extends BlockContainer implements ICarvable { return Container.calcRedstoneFromInventory(getInventory(world, x, y, z)); } - @Override - @SideOnly(Side.CLIENT) + @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { this.blockIcon = register.registerIcon("planks_oak"); } public IInventory getInventory(World world, int x, int y, int z) { - Object object = world.getTileEntity(x, y, z); + Object object = (TileEntityPresent) world.getTileEntity(x, y, z); if (object == null) { return null; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java index dc5c5e13..1466b25d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -8,9 +10,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.render.BlockRoadLineRenderer; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockRoadLine extends Block { public IIcon aloneIcon; @@ -54,7 +53,7 @@ public class BlockRoadLine extends Block @Override public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { - return World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone); + return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone); } @Override diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java index e8565119..5997eacd 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -13,9 +16,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.render.BlockSnakeStoneRenderer; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockSnakestone extends Block { static final int SEC_HEAD = 0; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java index a96cb769..05cf10fc 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java @@ -1,14 +1,14 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; + import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; - public class BlockSnakestoneObsidian extends BlockSnakestone { public IIcon[] particles = new IIcon[8]; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java index 8ec7ee62..65b0f0fe 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java @@ -1,5 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -8,12 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.client.render.BlockSpikesRenderer; -import com.cricketcraft.minecraft.chisel.utils.General; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java similarity index 89% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java index cd1de5d8..ca9fa5f8 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java @@ -1,13 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; - +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.client.render.BlockTexturedOreRenderer; - public class BlockTexturedOre extends Block { public int currentPass; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java similarity index 72% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java index a424d01d..0edfc2bf 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java @@ -1,4 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.utils.General; import java.util.Random; @@ -8,13 +15,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.utils.General; - public class BlockVoidstone extends Block implements ICarvable{ public CarvableHelper carverHelper; public IIcon iconParticle; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java similarity index 79% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java index 4d84bcfa..0cd9ea95 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java @@ -1,15 +1,14 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockVoidstonePillar extends Block implements ICarvable{ public static IIcon topBottom, pillarSide; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java index 9306a2fd..58bee7dd 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java index 53868f74..2b020471 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.List; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java index 89cf037d..d55f37dc 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block.tileentity; +package info.jbcs.minecraft.chisel.block.tileentity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java index ce0c85c5..662419be 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java @@ -1,4 +1,8 @@ -package com.cricketcraft.minecraft.chisel.block.tileentity; +package info.jbcs.minecraft.chisel.block.tileentity; + +import info.jbcs.minecraft.chisel.block.BlockPresent; +import info.jbcs.minecraft.chisel.inventory.ContainerPresent; +import info.jbcs.minecraft.chisel.inventory.InventoryLargePresent; import java.util.Iterator; import java.util.List; @@ -9,10 +13,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.AxisAlignedBB; -import com.cricketcraft.minecraft.chisel.block.BlockPresent; -import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; -import com.cricketcraft.minecraft.chisel.inventory.InventoryLargePresent; - public class TileEntityPresent extends TileEntityChest { public TileEntityPresent() { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index 7bd86c59..1b5e6caa 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -1,4 +1,13 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; +import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; +import info.jbcs.minecraft.chisel.client.render.CTM; +import info.jbcs.minecraft.chisel.client.render.TextureSubmap; +import info.jbcs.minecraft.chisel.item.ItemCarvable; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import java.util.ArrayList; import java.util.HashSet; @@ -13,16 +22,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; -import com.cricketcraft.minecraft.chisel.client.render.CTM; -import com.cricketcraft.minecraft.chisel.client.render.TextureSubmap; -import com.cricketcraft.minecraft.chisel.item.ItemCarvable; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - import cpw.mods.fml.common.registry.GameRegistry; public class CarvableHelper diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java index 4d0d04c7..b1858777 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java @@ -1,10 +1,9 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; +import info.jbcs.minecraft.chisel.client.render.TextureSubmap; import net.minecraft.block.Block; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.client.render.TextureSubmap; - public class CarvableVariation { public String blockName; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java index 345acc11..70b34bb1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java @@ -1,4 +1,6 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; + +import info.jbcs.minecraft.chisel.Chisel; import java.util.ArrayList; import java.util.Collections; @@ -10,8 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.cricketcraft.minecraft.chisel.Chisel; - public class Carving { HashMap carvingGroupsByName = new HashMap(); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java index a2e81a95..a45a3935 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; import java.util.ArrayList; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java similarity index 90% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java index f846ea39..37d33136 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; import net.minecraft.block.Block; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java rename to src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java index 7031e741..45ee1528 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java @@ -1,4 +1,17 @@ -package com.cricketcraft.minecraft.chisel.client; +package info.jbcs.minecraft.chisel.client; + +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.block.BlockGrimstone; +import info.jbcs.minecraft.chisel.block.BlockHolystone; +import info.jbcs.minecraft.chisel.block.BlockLavastone; +import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; +import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX; +import info.jbcs.minecraft.chisel.entity.fx.EntityGrimstoneFX; +import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX; +import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; +import info.jbcs.minecraft.chisel.entity.fx.EntityVoidstoneFX; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import java.util.Random; @@ -11,19 +24,6 @@ import net.minecraft.client.particle.EntityLavaFX; import net.minecraft.entity.Entity; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.block.BlockGrimstone; -import com.cricketcraft.minecraft.chisel.block.BlockHolystone; -import com.cricketcraft.minecraft.chisel.block.BlockLavastone; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.minecraft.chisel.block.BlockVoidstone; -import com.cricketcraft.minecraft.chisel.entity.fx.EntityBallOMossFX; -import com.cricketcraft.minecraft.chisel.entity.fx.EntityGrimstoneFX; -import com.cricketcraft.minecraft.chisel.entity.fx.EntityHolystoneFX; -import com.cricketcraft.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; -import com.cricketcraft.minecraft.chisel.entity.fx.EntityVoidstoneFX; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - public class GeneralChiselClient { public static Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java similarity index 80% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java index ec267d65..54ff085f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.inventory.ContainerAutoChisel; - public class GuiAutoChisel extends GuiContainer { private static final ResourceLocation gui = new ResourceLocation("chisel:textures/autochisel-gui.png"); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java index 40f5e881..950d3002 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java @@ -1,5 +1,8 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.inventory.ContainerChisel; +import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -7,10 +10,6 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.minecraft.chisel.inventory.InventoryChiselSelection; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - public class GuiChisel extends GuiContainer { public EntityPlayer player; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java similarity index 76% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java index 27b8071b..847b9084 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java @@ -1,12 +1,10 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Configurations; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.Configurations; - import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java index 042a6c4c..86735a53 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java index 8fced107..15908121 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; import java.util.ArrayList; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java index 6b104095..a986cc16 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class GuiExButton extends GuiElement { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java index 657df7dc..344f36de 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; import java.util.Set; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java index 323d291a..fc4d2330 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class GuiLabel extends GuiElement { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java index 5362c916..a50a41a7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +import info.jbcs.minecraft.chisel.inventory.ContainerPresent; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -7,9 +9,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; - public class GuiPresent extends GuiContainer { private static final ResourceLocation gui = new ResourceLocation("chisel:textures/present-gui.png"); private IInventory upper, lower; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java index 38cb0bad..8112be99 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.utils.DummyContainer; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; @@ -10,9 +12,6 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.utils.DummyContainer; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - public class GuiScreenPlus extends GuiContainer { public int screenW; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java index 781022cb..aa1a8a8e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java similarity index 51% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java index af073437..bccd1dd5 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class InputEvent { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java similarity index 65% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java index 61dd7052..4869df9c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class InputKeyboardEvent extends InputEvent { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java similarity index 78% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java index 9677dd60..da47d9d7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class InputMouseEvent extends InputEvent { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java index 94290a50..1d89172f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import org.lwjgl.input.Mouse; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - public abstract class Scrollbar extends GuiButton { public boolean active; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java index 3e234205..04d5dc98 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class TexturedBox { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java index 82703b75..962acd37 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.model; +package info.jbcs.minecraft.chisel.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -99,8 +99,7 @@ public class ModelAutoChisel extends ModelBase setRotation(Shape12, 0F, 0F, 0F); } - @Override -public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java index eecfb177..f2e91dcd 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java @@ -1,17 +1,16 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java similarity index 79% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java index 4f35fbdf..c2ead782 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java @@ -1,7 +1,6 @@ -package com.cricketcraft.minecraft.chisel.client.render; - -import com.cricketcraft.minecraft.chisel.Chisel; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.Chisel; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java index b24d6968..3866114d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -51,8 +50,8 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler double v1 = icon.getMinV(); double uu = icon.getInterpolatedU(8.0D); double vv = icon.getInterpolatedV(8.0D); - - + + int lyp=block.getMixedBrightnessForBlock(world, x, y+1, z); int lym=block.getMixedBrightnessForBlock(world, x, y-1, z); int lxp=block.getMixedBrightnessForBlock(world, x+1, y, z); @@ -62,11 +61,11 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler - - - - - + + + + + @@ -77,14 +76,14 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler u1 = icon.getMaxU(); v1 = icon.getMaxV(); vertex(1,u0,v0); vertex(5,u1,v0); vertex(6,u1,v1); vertex(2,u0,v1); - + icon = block.getIcon(1, meta); u0 = icon.getMinU(); v0 = icon.getMinV(); u1 = icon.getMaxU(); v1 = icon.getMaxV(); vertex(0,u0,v0); vertex(3,u0,v1); vertex(7,u1,v1); vertex(4,u1,v0); - + */ renderer.blockAccess = world; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java index e7288ad3..12e1b0d8 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java @@ -1,5 +1,6 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.client.renderer.EntityRenderer; @@ -10,8 +11,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java index 7e6ef3b2..9f4b2c04 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java @@ -1,15 +1,14 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.block.BlockMarblePillar; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.BlockMarblePillar; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java similarity index 89% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java index 3657cd32..5157a25d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairs; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java index e28429b9..06579385 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java @@ -1,13 +1,12 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java index cf4f0a44..9cf0f1e1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java @@ -1,15 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.block.BlockRoadLine; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.minecraft.chisel.block.BlockRoadLine; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java index d0cd0f2d..5193cbdc 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.block.BlockSnakestone; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestone; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java index 78b31654..a998d977 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; + +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.utils.Drawing; import java.util.Random; @@ -7,10 +10,6 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java index a4c05c95..f92011d3 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.block.BlockTexturedOre; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; @@ -7,9 +9,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.BlockTexturedOre; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java index 300e23f9..4c63058e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java @@ -1,10 +1,9 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.api.IFacade; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.minecraft.chisel.api.IFacade; - public class CTM { static int submaps[][] = { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java index 21567991..14844492 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java index 10b40e3b..0232d4fc 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.util.IIcon; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java index c5817803..0cf034fa 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java index eed380f7..6fc9a115 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java index 41f6d2cb..6f1220e1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java index 5a6e79ef..e24ee64b 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java index 24c63ce4..d8669c65 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java @@ -1,13 +1,12 @@ -package com.cricketcraft.minecraft.chisel.client.render.item; +package info.jbcs.minecraft.chisel.client.render.item; +import info.jbcs.minecraft.chisel.client.model.ModelAutoChisel; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.client.model.ModelAutoChisel; - import cpw.mods.fml.client.FMLClientHandler; public class ItemAutoChiselRenderer implements IItemRenderer{ diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java index 78e6cfeb..5a845e8e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render.item; +package info.jbcs.minecraft.chisel.client.render.item; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java index c6e4b95e..55717226 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java @@ -1,5 +1,6 @@ -package com.cricketcraft.minecraft.chisel.client.render.item; +package info.jbcs.minecraft.chisel.client.render.item; +import info.jbcs.minecraft.chisel.Chisel; import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -7,8 +8,6 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.Chisel; - import cpw.mods.fml.client.FMLClientHandler; public class ItemPresentRenderer implements IItemRenderer { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java index 5e489764..f27e72be 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java @@ -1,10 +1,12 @@ -package com.cricketcraft.minecraft.chisel.client.render.tile; +package info.jbcs.minecraft.chisel.client.render.tile; import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glRotatef; import static org.lwjgl.opengl.GL11.glScalef; import static org.lwjgl.opengl.GL11.glTranslatef; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import info.jbcs.minecraft.chisel.client.model.ModelAutoChisel; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -16,9 +18,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.client.model.ModelAutoChisel; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java index d7c65d91..e08f5487 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.render.tile; +package info.jbcs.minecraft.chisel.client.render.tile; +import info.jbcs.minecraft.chisel.block.BlockPresent; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; import net.minecraft.block.Block; import net.minecraft.block.BlockChest; import net.minecraft.client.model.ModelChest; @@ -10,9 +12,6 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.cricketcraft.minecraft.chisel.block.BlockPresent; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; - import cpw.mods.fml.common.FMLLog; public class RenderPresent extends TileEntityChestRenderer { @@ -91,7 +90,7 @@ public class RenderPresent extends TileEntityChestRenderer { GL11.glTranslatef(0.0F, 0.0F, -1.0F); } - GL11.glRotatef(short1, 0.0F, 1.0F, 0.0F); + GL11.glRotatef((float) short1, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); float f1 = present.prevLidAngle + (present.lidAngle - present.prevLidAngle) * partialTicks; float f2; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java b/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java index 3e83423b..2289cca1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java @@ -1,7 +1,6 @@ -package com.cricketcraft.minecraft.chisel.compat; - -import com.cricketcraft.minecraft.chisel.carving.Carving; +package info.jbcs.minecraft.chisel.compat; +import info.jbcs.minecraft.chisel.carving.Carving; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; @@ -15,7 +14,7 @@ public class Compatibility addSupport("ProjRed|Exploration", "projectred.exploration.stone", "marble", 0, 99); addSupport("bluepower", "marble", "marble", 0, 99); - + addSupport("PFAAGeologica", "strongStone", "marble", 5, 99); addSupport("PFAAGeologica", "strongStoneSlab", "marbleSlab", 5, 99); addSupport("PFAAGeologica", "strongStoneBrickStairs.marble", "marbleStairs", 0, 99); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java index c692349a..52c1ac0e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java @@ -1,11 +1,9 @@ -package com.cricketcraft.minecraft.chisel.compat; +package info.jbcs.minecraft.chisel.compat; +import info.jbcs.minecraft.chisel.compat.ModIntegration.IModIntegration; +import info.jbcs.minecraft.chisel.init.ModBlocks; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; - -import com.cricketcraft.minecraft.chisel.compat.ModIntegration.IModIntegration; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; - import cpw.mods.fml.common.event.FMLInterModComms; public class FMPIntegration implements IModIntegration{ diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java index 87bc3da7..7712f15d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java @@ -1,9 +1,7 @@ -package com.cricketcraft.minecraft.chisel.compat; +package info.jbcs.minecraft.chisel.compat; +import info.jbcs.minecraft.chisel.carving.Carving; import net.minecraft.block.Block; - -import com.cricketcraft.minecraft.chisel.carving.Carving; - import cpw.mods.fml.common.event.FMLPostInitializationEvent; public class MarbleCompatibility diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java index e46f37fe..66bb8435 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.compat; +package info.jbcs.minecraft.chisel.compat; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java similarity index 91% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java index bfda35cb..adc8ca1f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java @@ -1,5 +1,9 @@ -package com.cricketcraft.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -7,11 +11,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntityBallOMoss extends EntityThrowable { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java index 9d7bf6e7..0144d928 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java @@ -1,4 +1,6 @@ -package com.cricketcraft.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity; + +import info.jbcs.minecraft.chisel.init.ModBlocks; import java.util.Random; @@ -7,8 +9,6 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; - public class EntityCloudInABottle extends EntityThrowable { Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java index 9357b963..656535e3 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java @@ -1,5 +1,6 @@ -package com.cricketcraft.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -7,8 +8,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntitySmashingRock extends EntityThrowable { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java index 9d927da4..0efac068 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java @@ -1,5 +1,8 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; +import info.jbcs.minecraft.chisel.init.ModItems; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; @@ -7,10 +10,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.minecraft.chisel.init.ModItems; -import com.cricketcraft.minecraft.chisel.utils.General; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java index ffd64d58..4f822557 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockGrimstone; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.block.BlockGrimstone; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntityGrimstoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java index c7fc09b7..5b7d9ba5 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockHolystone; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.block.BlockHolystone; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntityHolystoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 6c07e517..58fb6bf2 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntitySnakestoneObsidianFX extends EntityFX { BlockSnakestoneObsidian block; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java index a01b1740..6d903bfe 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.block.BlockVoidstone; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntityVoidstoneFX extends EntityFX { static final float fadetime = 20F; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java rename to src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java index 457ca1a0..10fdb231 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java @@ -1,53 +1,51 @@ -package com.cricketcraft.minecraft.chisel.init; +package info.jbcs.minecraft.chisel.init; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.block.BlockAutoChisel; +import info.jbcs.minecraft.chisel.block.BlockBeaconBase; +import info.jbcs.minecraft.chisel.block.BlockCarvable; +import info.jbcs.minecraft.chisel.block.BlockCarvableGlass; +import info.jbcs.minecraft.chisel.block.BlockCarvablePane; +import info.jbcs.minecraft.chisel.block.BlockCarvablePowered; +import info.jbcs.minecraft.chisel.block.BlockCloud; +import info.jbcs.minecraft.chisel.block.BlockConcrete; +import info.jbcs.minecraft.chisel.block.BlockEldritch; +import info.jbcs.minecraft.chisel.block.BlockGrimstone; +import info.jbcs.minecraft.chisel.block.BlockHolystone; +import info.jbcs.minecraft.chisel.block.BlockLavastone; +import info.jbcs.minecraft.chisel.block.BlockLeaf; +import info.jbcs.minecraft.chisel.block.BlockLightstoneCarvable; +import info.jbcs.minecraft.chisel.block.BlockMarbleBookshelf; +import info.jbcs.minecraft.chisel.block.BlockMarbleCarpet; +import info.jbcs.minecraft.chisel.block.BlockMarbleIce; +import info.jbcs.minecraft.chisel.block.BlockMarbleIceStairs; +import info.jbcs.minecraft.chisel.block.BlockMarblePillar; +import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; +import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; +import info.jbcs.minecraft.chisel.block.BlockMarbleStairsMaker; +import info.jbcs.minecraft.chisel.block.BlockMarbleStairsMakerCreator; +import info.jbcs.minecraft.chisel.block.BlockMarbleWall; +import info.jbcs.minecraft.chisel.block.BlockPresent; +import info.jbcs.minecraft.chisel.block.BlockRoadLine; +import info.jbcs.minecraft.chisel.block.BlockSnakestone; +import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; +import info.jbcs.minecraft.chisel.block.BlockSpikes; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; +import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar; +import info.jbcs.minecraft.chisel.block.BlockWaterstone; +import info.jbcs.minecraft.chisel.block.ItemBlockAutoChisel; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.carving.Carving; +import info.jbcs.minecraft.chisel.item.ItemCarvable; +import info.jbcs.minecraft.chisel.item.ItemMarbleSlab; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.block.BlockAutoChisel; -import com.cricketcraft.minecraft.chisel.block.BlockBeaconBase; -import com.cricketcraft.minecraft.chisel.block.BlockCarvable; -import com.cricketcraft.minecraft.chisel.block.BlockCarvableGlass; -import com.cricketcraft.minecraft.chisel.block.BlockCarvablePane; -import com.cricketcraft.minecraft.chisel.block.BlockCarvablePowered; -import com.cricketcraft.minecraft.chisel.block.BlockCloud; -import com.cricketcraft.minecraft.chisel.block.BlockConcrete; -import com.cricketcraft.minecraft.chisel.block.BlockEldritch; -import com.cricketcraft.minecraft.chisel.block.BlockGrimstone; -import com.cricketcraft.minecraft.chisel.block.BlockHolystone; -import com.cricketcraft.minecraft.chisel.block.BlockLavastone; -import com.cricketcraft.minecraft.chisel.block.BlockLeaf; -import com.cricketcraft.minecraft.chisel.block.BlockLightstoneCarvable; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleBookshelf; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleCarpet; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleIce; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleIceStairs; -import com.cricketcraft.minecraft.chisel.block.BlockMarblePillar; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairs; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairsMaker; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairsMakerCreator; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleWall; -import com.cricketcraft.minecraft.chisel.block.BlockPresent; -import com.cricketcraft.minecraft.chisel.block.BlockRoadLine; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestone; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.minecraft.chisel.block.BlockSpikes; -import com.cricketcraft.minecraft.chisel.block.BlockVoidstone; -import com.cricketcraft.minecraft.chisel.block.BlockVoidstonePillar; -import com.cricketcraft.minecraft.chisel.block.BlockWaterstone; -import com.cricketcraft.minecraft.chisel.block.ItemBlockAutoChisel; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.carving.Carving; -import com.cricketcraft.minecraft.chisel.item.ItemCarvable; -import com.cricketcraft.minecraft.chisel.item.ItemMarbleSlab; - import cpw.mods.fml.common.registry.GameRegistry; public class ModBlocks { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java similarity index 75% rename from src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java rename to src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java index 682ff1a9..81278be6 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java @@ -1,16 +1,15 @@ -package com.cricketcraft.minecraft.chisel.init; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.minecraft.chisel.item.ItemBallOMoss; -import com.cricketcraft.minecraft.chisel.item.ItemChisel; -import com.cricketcraft.minecraft.chisel.item.ItemCloudInABottle; -import com.cricketcraft.minecraft.chisel.item.ItemSmashingRock; -import com.cricketcraft.minecraft.chisel.item.ItemUpgrade; +package info.jbcs.minecraft.chisel.init; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; +import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; +import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; +import info.jbcs.minecraft.chisel.item.ItemBallOMoss; +import info.jbcs.minecraft.chisel.item.ItemChisel; +import info.jbcs.minecraft.chisel.item.ItemCloudInABottle; +import info.jbcs.minecraft.chisel.item.ItemSmashingRock; +import info.jbcs.minecraft.chisel.item.ItemUpgrade; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java rename to src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java index a4f1275b..7c0fef9d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.init; +package info.jbcs.minecraft.chisel.init; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java index aafd0e80..2ea78121 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java @@ -1,13 +1,12 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; - public class ContainerAutoChisel extends Container { public static TileEntityAutoChisel autoChisel; @@ -15,7 +14,7 @@ public class ContainerAutoChisel extends Container { public ContainerAutoChisel(InventoryPlayer player, TileEntityAutoChisel tileEntityAutoChisel) { - ContainerAutoChisel.player = player.player; + this.player = player.player; autoChisel = tileEntityAutoChisel; addSlotToContainer(new Slot(tileEntityAutoChisel, 0, 53, 15)); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java index f022ed77..dff2f7b0 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java @@ -1,5 +1,8 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; +import info.jbcs.minecraft.chisel.carving.Carving; +import info.jbcs.minecraft.chisel.item.ItemChisel; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -8,10 +11,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import com.cricketcraft.minecraft.chisel.carving.Carving; -import com.cricketcraft.minecraft.chisel.item.ItemChisel; -import com.cricketcraft.minecraft.chisel.utils.General; - public class ContainerChisel extends Container { public final InventoryChiselSelection inventory; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java index 45ce6585..eee7e9ca 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; import net.minecraft.inventory.ContainerChest; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java index 77331a4c..d77cff9e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java @@ -1,4 +1,6 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; + +import info.jbcs.minecraft.chisel.item.ItemChisel; import java.util.ArrayList; @@ -8,8 +10,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.cricketcraft.minecraft.chisel.item.ItemChisel; - public class InventoryChiselSelection implements IInventory { ItemStack chisel = null; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java index d729ee01..3cac0ee4 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java index 85928f9e..31e6d595 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java index 09e1649c..08875d62 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java index 112cba2c..b9a82192 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.cricketcraft.minecraft.chisel.utils.General; - public class SlotChiselSelection extends Slot { public SlotChiselSelection(ContainerChisel container, InventoryChiselSelection inv, IInventory iinventory, int i, int j, int k) @@ -61,7 +60,7 @@ public class SlotChiselSelection extends Slot String sound = container.carving.getVariationSound(itemstack.getItem(), itemstack.getItemDamage()); player.worldObj.playSoundAtEntity(player, sound, 0.3f + 0.7f * General.rand.nextFloat(), 0.6f + 0.4f * General.rand.nextFloat()); - + /* ItemStack stack=player.inventory.getItemStack(); putStack(new ItemStack(itemstack.itemID, itemstack.stackSize, itemstack.getItemDamage())); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java index e50f111b..908ac98c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; +import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; - public class ItemBallOMoss extends Item { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java similarity index 81% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java index 42f8d2ca..b72de686 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; + +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.utils.General; import java.util.List; @@ -9,11 +14,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.utils.General; - public class ItemCarvable extends ItemBlock { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java similarity index 78% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java index 27d0d99f..4bed6b23 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ChiselMode; +import info.jbcs.minecraft.chisel.api.IChiselMode; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.Carving; import java.util.HashSet; import java.util.Set; @@ -8,12 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ChiselMode; -import com.cricketcraft.minecraft.chisel.api.IChiselMode; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.Carving; - public class ItemChisel extends ItemTool implements IChiselMode { private static final HashSet toolSet = new HashSet(); public static Carving carving = Carving.chisel; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java index 6c734110..0ecfa8a1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; +import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; - public class ItemCloudInABottle extends Item { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java index 14dcb453..5b7724a6 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java @@ -1,13 +1,12 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; +import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; - public class ItemMarbleSlab extends ItemCarvable { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java index ee0fee66..b744dfb3 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; +import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; - public class ItemSmashingRock extends Item { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java index a02f08b0..f25e73e7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import java.util.List; @@ -12,9 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; - public class ItemUpgrade extends Item{ public IIcon[] icons = new IIcon[6]; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java similarity index 55% rename from src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java rename to src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java index afe53001..df990b86 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java @@ -1,33 +1,31 @@ -package com.cricketcraft.minecraft.chisel.proxy; +package info.jbcs.minecraft.chisel.proxy; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +import info.jbcs.minecraft.chisel.client.render.BlockAdvancedMarbleRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockCarpetRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockEldritchRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockMarblePaneRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockMarblePillarRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockNoCTMRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer; +import info.jbcs.minecraft.chisel.client.render.item.ItemAutoChiselRenderer; +import info.jbcs.minecraft.chisel.client.render.item.ItemChiselRenderer; +import info.jbcs.minecraft.chisel.client.render.item.ItemPresentRenderer; +import info.jbcs.minecraft.chisel.client.render.tile.RenderAutoChisel; +import info.jbcs.minecraft.chisel.client.render.tile.RenderPresent; +import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; +import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; +import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; - -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.minecraft.chisel.client.render.BlockAdvancedMarbleRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockCarpetRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockEldritchRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePaneRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePillarRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarbleStairsRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockNoCTMRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockRoadLineRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockSnakeStoneRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockSpikesRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockTexturedOreRenderer; -import com.cricketcraft.minecraft.chisel.client.render.item.ItemAutoChiselRenderer; -import com.cricketcraft.minecraft.chisel.client.render.item.ItemChiselRenderer; -import com.cricketcraft.minecraft.chisel.client.render.item.ItemPresentRenderer; -import com.cricketcraft.minecraft.chisel.client.render.tile.RenderAutoChisel; -import com.cricketcraft.minecraft.chisel.client.render.tile.RenderPresent; -import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java similarity index 64% rename from src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java rename to src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java index 040953c0..c4dde346 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java +++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java @@ -1,8 +1,7 @@ -package com.cricketcraft.minecraft.chisel.proxy; - -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; +package info.jbcs.minecraft.chisel.proxy; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java index 78ee24b9..f1522da7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java index 23ef0aa0..a00a22b7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java b/src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java index 341b5e20..881f8fc8 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java b/src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java similarity index 83% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java index a12abb7c..57dbac59 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/General.java index c4880673..4bc6dedd 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java index 50e99239..4c1bccc8 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import java.util.HashMap; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java index 83c33041..d5532d7a 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java b/src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java index 5b18d9c2..5874d40f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java rename to src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java index b2270f00..7e809401 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.world; +package info.jbcs.minecraft.chisel.world; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java rename to src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java index 97ea6844..1916fa8b 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java +++ b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.world; +package info.jbcs.minecraft.chisel.world; import java.util.Random;