diff --git a/src/main/java/info/jbcs/minecraft/chisel/Carvable.java b/src/main/java/info/jbcs/minecraft/chisel/Carvable.java deleted file mode 100755 index e7a00658..00000000 --- a/src/main/java/info/jbcs/minecraft/chisel/Carvable.java +++ /dev/null @@ -1,5 +0,0 @@ -package info.jbcs.minecraft.chisel; - -public interface Carvable { - CarvableVariation getVariation(int metadata); -} diff --git a/src/main/java/info/jbcs/minecraft/chisel/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/CarvableHelper.java index c6ceda6d..bf620128 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/CarvableHelper.java @@ -60,7 +60,7 @@ public class CarvableHelper { } public void addVariation(String description, int metadata, String texture, Block block, int blockMeta) { - if (variations.size() > 15) + if (variations.size() >= 16) return; if(blockName==null && block!=null) blockName=block.getLocalizedName(); @@ -250,11 +250,24 @@ public class CarvableHelper { void register(Block block, String name) { register(block, name, ItemCarvable.class); } - + + void register(Block block, String name, int metaBegin, int metaEnd) { + register(block, name, metaBegin, metaEnd, ItemCarvable.class); + } + void register(Block block, String name, Class cl) { - block.setBlockName(name); - GameRegistry.registerBlock(block, cl, name); + register(block, name, 0, 15, cl); + } + + private boolean hasRegisteredBlock = false; + void register(Block block, String name, int metaBegin, int metaEnd, Class cl) { + block.setBlockName(name); + if(!hasRegisteredBlock) { + GameRegistry.registerBlock(block, cl, name); + hasRegisteredBlock = true; + } + if (block instanceof BlockMarbleSlab) { BlockMarbleSlab slab = (BlockMarbleSlab) block; GameRegistry.registerBlock(slab.top, cl, name + ".top"); @@ -267,8 +280,6 @@ public class CarvableHelper { BlockMarbleSlab slab = (BlockMarbleSlab) block; slab.top.setHarvestLevel("chisel", 0, variation.metadata); - slab.top.setHardness(slab.blockHardness).setResistance(slab.blockResistance); - if(! forbidChiseling){ Carving.chisel.addVariation(name + ".top", slab.top, variation.metadata, 0); Carving.chisel.setGroupClass(name + ".top", name); @@ -370,9 +381,6 @@ public class CarvableHelper { public void registerSubBlocks(Block block, CreativeTabs tabs, List list) { for (CarvableVariation variation : variations) { - if ((!Chisel.overrideVanillaBlocks) && variation.block != null) - continue; - list.add(new ItemStack(block, 1, variation.metadata)); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/CarvableVariation.java b/src/main/java/info/jbcs/minecraft/chisel/CarvableVariation.java index aacfc835..9ff7de47 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/CarvableVariation.java +++ b/src/main/java/info/jbcs/minecraft/chisel/CarvableVariation.java @@ -5,15 +5,15 @@ import net.minecraft.block.Block; import net.minecraft.util.IIcon; public class CarvableVariation { - String blockName; + public String blockName; public String description; - int metadata; + public int metadata; public int kind; - Block block; - int blockMeta; + public Block block; + public int blockMeta; - String texture; + public String texture; public IIcon icon; public IIcon iconTop; diff --git a/src/main/java/info/jbcs/minecraft/chisel/Carving.java b/src/main/java/info/jbcs/minecraft/chisel/Carving.java index 4e811be1..fcb4e1d4 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/Carving.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Carving.java @@ -32,11 +32,11 @@ public class Carving { public static Carving needle=new Carving(); String key(Item item,int metadata){ - return Item.getIdFromItem(item)+"|"+metadata; + return item.getUnlocalizedName()+"|"+metadata; } String key(Block block, int metadata){ - return Block.getIdFromBlock(block)+"|"+metadata; + return block.getUnlocalizedName()+"|"+metadata; } public boolean isVariationOfSameClass(Block target,int metadata1, Block block2, int metadata2){ diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 75cca2a0..6f5df808 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -3,16 +3,16 @@ package info.jbcs.minecraft.chisel; 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.BlockGlassCarvable; +import info.jbcs.minecraft.chisel.block.BlockCarvableGlass; import info.jbcs.minecraft.chisel.block.BlockHolystone; import info.jbcs.minecraft.chisel.block.BlockLavastone; import info.jbcs.minecraft.chisel.block.BlockLightstoneCarvable; -import info.jbcs.minecraft.chisel.block.BlockMarble; +import info.jbcs.minecraft.chisel.block.BlockCarvable; 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.BlockMarblePane; +import info.jbcs.minecraft.chisel.block.BlockCarvablePane; import info.jbcs.minecraft.chisel.block.BlockMarblePillar; import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; @@ -39,8 +39,6 @@ import info.jbcs.minecraft.utilities.General; import java.io.File; import java.util.ArrayList; -import pl.asie.computronics.NetworkHandlerClient; -import pl.asie.computronics.NetworkHandlerServer; import pl.asie.lib.network.PacketHandler; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -78,64 +76,65 @@ public class Chisel { public static ItemCloudInABottle itemCloudInABottle; public static ItemBallOMoss itemBallOMoss; - public static BlockMarble blockMarble; - public static BlockMarble blockMarblePillar; - public static BlockMarble blockLimestone; + public static BlockCarvable blockMarble; + public static BlockCarvable blockMarblePillar; + public static BlockCarvable blockLimestone; public static BlockMarbleSlab blockMarbleSlab; public static BlockMarbleSlab blockLimestoneSlab; public static BlockMarbleSlab blockMarblePillarSlab; - public static BlockMarble blockCobblestone; + public static BlockCarvable blockCobblestone; public static BlockMarbleWall cobblestoneWall; - public static BlockGlassCarvable blockGlass; - public static BlockMarblePane blockPaneGlass; - public static BlockMarble blockSandstone; - public static BlockMarble blockSandstoneScribbles; + public static BlockCarvableGlass blockGlass; + public static BlockCarvablePane blockPaneGlass; + public static BlockCarvable blockSandstone; + public static BlockCarvable blockSandstoneScribbles; public static BlockConcrete blockConcrete; public static BlockRoadLine blockRoadLine; - public static BlockMarble blockIron; - public static BlockMarble blockGold; - public static BlockMarble blockDiamond; + public static BlockCarvable blockIron; + public static BlockCarvable blockGold; + public static BlockCarvable blockDiamond; public static BlockLightstoneCarvable blockLightstone; - public static BlockMarble blockLapis; - public static BlockMarble blockEmerald; - public static BlockMarble blockNetherBrick; - public static BlockMarble blockNetherrack; - public static BlockMarble blockCobblestoneMossy; - public static BlockMarble stoneBrick; + public static BlockCarvable blockLapis; + public static BlockCarvable blockEmerald; + public static BlockCarvable blockNetherBrick; + public static BlockCarvable blockNetherrack; + public static BlockCarvable blockCobblestoneMossy; + public static BlockCarvable stoneBrick; public static BlockMarbleStairs blockMarbleStairs; public static BlockMarbleStairs blockLimestoneStairs; - public static BlockMarblePane blockPaneIron; + public static BlockCarvablePane blockPaneIron; public static BlockMarbleIce blockIce; public static BlockMarbleIce blockIcePillar; public static BlockMarbleIceStairs blockIceStairs; - public static BlockMarble[] blockPlanks=new BlockMarble[4]; - public static BlockMarble blockObsidian; + public static BlockCarvable[] blockPlanks=new BlockCarvable[6]; + public static BlockCarvable blockObsidian; public static BlockPoweredMarble blockRedstone; public static BlockHolystone blockHolystone; public static BlockLavastone blockLavastone; - public static BlockMarble blockFft; - public static BlockMarble blockCarpet; + public static BlockCarvable blockFft; + public static BlockCarvable blockCarpet; public static BlockMarbleCarpet blockCarpetFloor; - public static BlockMarble blockBookshelf; - public static BlockMarble blockTyrian; - public static BlockMarble blockDirt; + public static BlockCarvable blockBookshelf; + public static BlockCarvable blockTyrian; + public static BlockCarvable blockDirt; public static BlockCloud blockCloud; - public static BlockMarble blockTemple; - public static BlockMarble blockTempleMossy; - public static BlockMarble blockFactory; + public static BlockCarvable blockTemple; + public static BlockCarvable blockTempleMossy; + public static BlockCarvable blockFactory; public static BlockSnakestone blockSnakestone; public static BlockSnakestone blockSandSnakestone; public static BlockSnakestoneObsidian blockObsidianSnakestone; public static BlockSpikes blockSpiketrap; - + + // 1.7 + public static BlockCarvableGlass[] blockStainedGlass = new BlockCarvableGlass[16]; + public static BlockCarvablePane[] blockStainedGlassPane = new BlockCarvablePane[16]; public static CreativeTabs tabChisel; public static boolean configExists; - public static boolean overrideVanillaBlocks; - public static boolean disableOverriding; public static boolean dropIceShards; public static boolean oldPillars; public static boolean disableCTM; @@ -213,10 +212,6 @@ public class Chisel { CraftingManager.getInstance().addRecipe(new ItemStack(Blocks.ice, 1), new Object[] { "**", "**", '*', itemIceshard, }); } - - overrideVanillaBlocks=config.get("general", "override vanilla blocks", configExists?true:false, "If true, will override vanilla blocks with their chisel variations. If false, will create one new chiseled block for each vanilla block that can be chiseled.").getBoolean(true); - disableOverriding=config.get("general", "disable overriding blocks", false, "Some blocks, like bookshelves and ice will not get overridden using \"override vanilla blocks\" setting. Set this to true to disable all overriding.").getBoolean(false); - if(config.get("general", "use custom creative tab", true, "Add a new tab in creative mode and put all blocks that work with chisel there.").getBoolean(true)){ tabChisel = new CreativeTabs("tabChisel") { @Override @@ -230,7 +225,7 @@ public class Chisel { tabChisel = CreativeTabs.tabBlock; } - blockMarble = (BlockMarble) new BlockMarble().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + blockMarble = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockMarble.carverHelper.setBlockName("Marble"); blockMarble.carverHelper.addVariation("Raw marble", 0, "marble"); blockMarble.carverHelper.addVariation("Marble brick", 1, "marble/a1-stoneornamental-marblebrick"); @@ -273,7 +268,7 @@ public class Chisel { blockMarbleSlab.carverHelper.register(blockMarbleSlab, "marbleSlab", ItemMarbleSlab.class); if(oldPillars){ - blockMarblePillar = (BlockMarble) new BlockMarble().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + blockMarblePillar = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockMarblePillar.carverHelper.setBlockName("Marble Pillar"); blockMarblePillar.carverHelper.addVariation("Marble pillar", 0, "marblepillarold/column"); blockMarblePillar.carverHelper.addVariation("Marble pillar capstone", 1, "marblepillarold/capstone"); @@ -292,7 +287,7 @@ public class Chisel { blockMarblePillar.carverHelper.addVariation("Greek marble pillar ornate base", 14, "marblepillarold/a1-stonepillar-greekbottomgreek"); blockMarblePillar.carverHelper.addVariation("Plain marble pillar ornate base", 15, "marblepillarold/a1-stonepillar-plainbottomgreek"); } else{ - blockMarblePillar = (BlockMarble) new BlockMarblePillar(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + blockMarblePillar = (BlockCarvable) new BlockMarblePillar(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockMarblePillar.carverHelper.setBlockName("Marble Pillar"); blockMarblePillar.carverHelper.addVariation("Marble pillar", 0, "marblepillar/pillar"); blockMarblePillar.carverHelper.addVariation("Original marble pillar", 1, "marblepillar/default"); @@ -373,7 +368,7 @@ public class Chisel { makerMarbleStairs.carverHelper.addVariation("Marble blocks stairs", 15, "marbleslab/marble-blocks"); makerMarbleStairs.create(); - blockLimestone = (BlockMarble) new BlockMarble().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + blockLimestone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockLimestone.carverHelper.setBlockName("Limestone"); blockLimestone.carverHelper.addVariation("Limestone", 0, "limestone"); blockLimestone.carverHelper.addVariation("Small limestone tiles", 1, "limestone/terrain-cobbsmalltilelight"); @@ -435,7 +430,7 @@ public class Chisel { makerLimestoneStairs.carverHelper.addVariation("Limestone stairs with dark panel", 15, "limestone/terrain-pistonback-lightpanel"); makerLimestoneStairs.create(); - blockCobblestone = (BlockMarble) new BlockMarble().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + blockCobblestone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockCobblestone.carverHelper.addVariation("Cobblestone", 0, Blocks.cobblestone); blockCobblestone.carverHelper.addVariation("Aligned cobblestone bricks", 1, "cobblestone/terrain-cobb-brickaligned"); blockCobblestone.carverHelper.addVariation("Detailed cobblestone bricks", 2, "cobblestone/terrain-cob-detailedbrick"); @@ -455,7 +450,7 @@ public class Chisel { blockCobblestone.carverHelper.register(blockCobblestone, "cobblestone"); Carving.chisel.registerOre("cobblestone","blockCobble"); - blockGlass = (BlockGlassCarvable) new BlockGlassCarvable().setHardness(0.3F).setStepSound(Block.soundTypeGlass); + blockGlass = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(0.3F).setStepSound(Block.soundTypeGlass); blockGlass.carverHelper.addVariation("Glass", 0, Blocks.glass); blockGlass.carverHelper.addVariation("Bubble glass", 1, "glass/terrain-glassbubble"); blockGlass.carverHelper.addVariation("Chinese glass", 2, "glass/terrain-glass-chinese"); @@ -475,7 +470,7 @@ public class Chisel { blockGlass.carverHelper.register(blockGlass, "glass"); Carving.chisel.registerOre("glass","blockGlass"); - blockSandstone = (BlockMarble) new BlockMarble().setStepSound(Block.soundTypeStone).setHardness(0.8F); + blockSandstone = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setHardness(0.8F); blockSandstone.carverHelper.addVariation("Sandstone", 0, Blocks.sandstone, 0); blockSandstone.carverHelper.addVariation("Chiseled Sandstone", 1, Blocks.sandstone, 1); blockSandstone.carverHelper.addVariation("Smooth Sandstone", 2, Blocks.sandstone, 2); @@ -502,7 +497,7 @@ public class Chisel { Carving.chisel.addVariation("sandstone", blockSandSnakestone, 1, 16); Carving.chisel.addVariation("sandstone", blockSandSnakestone, 13, 17); - blockSandstoneScribbles = (BlockMarble) new BlockMarble().setStepSound(Block.soundTypeStone).setHardness(0.8F); + blockSandstoneScribbles = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setHardness(0.8F); blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 0, "sandstone-scribbles/scribbles-0"); blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 1, "sandstone-scribbles/scribbles-1"); blockSandstoneScribbles.carverHelper.addVariation("Sandstone scribbles", 2, "sandstone-scribbles/scribbles-2"); @@ -541,7 +536,7 @@ public class Chisel { GameRegistry.registerBlock(blockRoadLine, ItemCarvable.class, "roadLine"); LanguageRegistry.addName(new ItemStack(blockRoadLine, 1, 0), "Road lines"); - blockIron = (BlockMarble) new BlockMarble().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); + blockIron = (BlockCarvable) new BlockCarvable().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); blockIron.carverHelper.addVariation("Iron block", 0, Blocks.iron_block); blockIron.carverHelper.addVariation("Large iron ingots", 1, "iron/terrain-iron-largeingot"); blockIron.carverHelper.addVariation("Small iron ingots", 2, "iron/terrain-iron-smallingot"); @@ -561,7 +556,7 @@ public class Chisel { blockIron.carverHelper.register(blockIron, "iron"); Carving.chisel.registerOre("iron","blockIron"); - blockGold = (BlockMarble) new BlockMarble().setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); + blockGold = (BlockCarvable) new BlockCarvable().setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); blockGold.carverHelper.addVariation("Gold block", 0, Blocks.gold_block); blockGold.carverHelper.addVariation("Large golden ingots", 1, "gold/terrain-gold-largeingot"); blockGold.carverHelper.addVariation("Small golden ingots", 2, "gold/terrain-gold-smallingot"); @@ -580,7 +575,7 @@ public class Chisel { blockGold.carverHelper.register(blockGold, "gold"); Carving.chisel.registerOre("gold","blockGold"); - blockDiamond = (BlockMarble) new BlockMarble().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); + blockDiamond = (BlockCarvable) new BlockCarvable().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); blockDiamond.carverHelper.addVariation("Diamond block", 0, Blocks.diamond_block); blockDiamond.carverHelper.addVariation("Embossed diamond block", 1, "diamond/terrain-diamond-embossed"); blockDiamond.carverHelper.addVariation("Diamond block with panel", 2, "diamond/terrain-diamond-gem"); @@ -617,7 +612,7 @@ public class Chisel { blockLightstone.carverHelper.register(blockLightstone, "lightstone"); Carving.chisel.registerOre("lightstone","blockGlowstone"); - blockLapis = (BlockMarble) new BlockMarble().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone); + blockLapis = (BlockCarvable) new BlockCarvable().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone); blockLapis.carverHelper.addVariation("Lapis block", 0, Blocks.lapis_block); blockLapis.carverHelper.addVariation("Chunky lapis block", 1, "lapis/terrain-lapisblock-chunky"); blockLapis.carverHelper.addVariation("Dark lapis block", 2, "lapis/terrain-lapisblock-panel"); @@ -630,7 +625,7 @@ public class Chisel { blockLapis.carverHelper.register(blockLapis, "lapis"); Carving.chisel.registerOre("lapis","blockLapis"); - blockEmerald = (BlockMarble) new BlockMarble().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + blockEmerald = (BlockCarvable) new BlockCarvable().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); blockEmerald.carverHelper.addVariation("Emerald block", 0, Blocks.emerald_block); blockEmerald.carverHelper.addVariation("Emerald panel", 1, "emerald/a1-blockemerald-emeraldpanel"); blockEmerald.carverHelper.addVariation("Classic emerald panel", 2, "emerald/a1-blockemerald-emeraldpanelclassic"); @@ -646,7 +641,7 @@ public class Chisel { blockEmerald.carverHelper.register(blockEmerald, "emerald"); Carving.chisel.registerOre("emerald","blockEmerald"); - blockNetherBrick = (BlockMarble) new BlockMarble().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + blockNetherBrick = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); blockNetherBrick.carverHelper.addVariation("Nether brick", 0, Blocks.nether_brick); blockNetherBrick.carverHelper.addVariation("Blue nether brick", 1, "netherbrick/a1-netherbrick-brinstar"); blockNetherBrick.carverHelper.addVariation("Spattered nether brick", 2, "netherbrick/a1-netherbrick-classicspatter"); @@ -666,7 +661,7 @@ public class Chisel { blockNetherBrick.carverHelper.register(blockNetherBrick, "netherBrick"); Carving.chisel.registerOre("netherBrick","netherBrick"); - blockNetherrack = (BlockMarble) new BlockMarble().setHardness(0.4F).setStepSound(Block.soundTypeStone); + blockNetherrack = (BlockCarvable) new BlockCarvable().setHardness(0.4F).setStepSound(Block.soundTypeStone); blockNetherrack.carverHelper.addVariation("Netherrack", 0, Blocks.netherrack); blockNetherrack.carverHelper.addVariation("Nethegravel with blood", 1, "netherrack/a1-netherrack-bloodgravel"); blockNetherrack.carverHelper.addVariation("Netherrack with blood", 2, "netherrack/a1-netherrack-bloodrock"); @@ -685,7 +680,7 @@ public class Chisel { blockNetherrack.carverHelper.register(blockNetherrack, "hellrock"); Carving.chisel.registerOre("hellrock","blockNetherrack"); - blockCobblestoneMossy = (BlockMarble) new BlockMarble().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + blockCobblestoneMossy = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone", 0, Blocks.mossy_cobblestone); blockCobblestoneMossy.carverHelper.addVariation("Aligned mossy cobblestone bricks", 1, "cobblestonemossy/terrain-cobb-brickaligned"); blockCobblestoneMossy.carverHelper.addVariation("Detailed mossy cobblestone bricks", 2, "cobblestonemossy/terrain-cob-detailedbrick"); @@ -705,7 +700,7 @@ public class Chisel { blockCobblestoneMossy.carverHelper.register(blockCobblestoneMossy, "stoneMoss"); Carving.chisel.registerOre("stoneMoss","blockCobblestoneMossy"); - stoneBrick = (BlockMarble) new BlockMarble().setHardness(1.5F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + stoneBrick = (BlockCarvable) new BlockCarvable().setHardness(1.5F).setResistance(10.0F).setStepSound(Block.soundTypeStone); stoneBrick.carverHelper.addVariation("Stone bricks", 0, Blocks.stonebrick,0); stoneBrick.carverHelper.addVariation("Mossy stone bricks", 1, Blocks.stonebrick,1); stoneBrick.carverHelper.addVariation("Cracked stone bricks", 2, Blocks.stonebrick,2); @@ -797,29 +792,31 @@ public class Chisel { } }); - String[] plank_names={"oak", "spruce", "birch", "jungle"}; - String[] plank_ucnames={"Oak", "Spruce", "Birch", "Jungle"}; - for(int i=0;i<4;i++){ + String[] plank_names={"oak", "spruce", "birch", "jungle", "acacia", "dark-oak"}; + String[] plank_ucnames={"Oak", "Spruce", "Birch", "Jungle", "Acacia", "Dark Oak"}; + for(int i=0;i<6;i++){ String n=plank_names[i]; String u=plank_ucnames[i]; - blockPlanks[i] = (BlockMarble) (new BlockMarble()).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood); + blockPlanks[i] = (BlockCarvable) (new BlockCarvable()).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood); blockPlanks[i].carverHelper.setBlockName(u+" Wood Planks"); blockPlanks[i].carverHelper.addVariation("Smooth "+n+" wood planks", 1, "planks-"+n+"/clean"); blockPlanks[i].carverHelper.addVariation("Short "+n+" wood planks", 2, "planks-"+n+"/short"); - blockPlanks[i].carverHelper.addVariation("Vertical "+n+" wood planks", 3, "planks-"+n+"/vertical"); - blockPlanks[i].carverHelper.addVariation("Vertical uneven "+n+" wood planks", 4, "planks-"+n+"/vertical-uneven"); - blockPlanks[i].carverHelper.addVariation(u+" wood parquet", 5, "planks-"+n+"/parquet"); blockPlanks[i].carverHelper.addVariation("Fancy "+n+" wood plank arrangement", 6, "planks-"+n+"/fancy"); - blockPlanks[i].carverHelper.addVariation(u+" wood plank blinds", 7, "planks-"+n+"/blinds"); blockPlanks[i].carverHelper.addVariation(u+" wood panel", 8, "planks-"+n+"/panel-nails"); blockPlanks[i].carverHelper.addVariation(u+" wood double slab", 9, "planks-"+n+"/double"); blockPlanks[i].carverHelper.addVariation(u+" wood crate", 10, "planks-"+n+"/crate"); blockPlanks[i].carverHelper.addVariation("Fancy "+n+" wood crate", 11, "planks-"+n+"/crate-fancy"); - blockPlanks[i].carverHelper.addVariation(u+" wood scaffold", 12, "planks-"+n+"/crateex"); blockPlanks[i].carverHelper.addVariation("Large long "+n+" wood planks", 13, "planks-"+n+"/large"); - blockPlanks[i].carverHelper.addVariation(u+" wood planks in disarray", 14, "planks-"+n+"/chaotic-hor"); - blockPlanks[i].carverHelper.addVariation("Vertical "+n+" wood planks in disarray", 15, "planks-"+n+"/chaotic"); + if(i < 4) { // TODO: We lack textures for these! + blockPlanks[i].carverHelper.addVariation("Vertical "+n+" wood planks", 3, "planks-"+n+"/vertical"); + blockPlanks[i].carverHelper.addVariation("Vertical uneven "+n+" wood planks", 4, "planks-"+n+"/vertical-uneven"); + blockPlanks[i].carverHelper.addVariation(u+" wood parquet", 5, "planks-"+n+"/parquet"); + blockPlanks[i].carverHelper.addVariation(u+" wood plank blinds", 7, "planks-"+n+"/blinds"); + blockPlanks[i].carverHelper.addVariation(u+" wood scaffold", 12, "planks-"+n+"/crateex"); + blockPlanks[i].carverHelper.addVariation(u+" wood planks in disarray", 14, "planks-"+n+"/chaotic-hor"); + blockPlanks[i].carverHelper.addVariation("Vertical "+n+" wood planks in disarray", 15, "planks-"+n+"/chaotic"); + } blockPlanks[i].carverHelper.register(blockPlanks[i], "wood-"+n); Carving.chisel.addVariation("wood-"+n, Blocks.planks, i, 0); Blocks.planks.setHarvestLevel("chisel", 0, i); @@ -828,7 +825,7 @@ public class Chisel { Carving.chisel.setVariationSound("wood-"+n, "chisel:chisel-wood"); } - blockObsidian = (BlockMarble) new BlockMarble().setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); + blockObsidian = (BlockCarvable) new BlockCarvable().setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); blockObsidian.carverHelper.addVariation("Obsidian", 0, Blocks.obsidian); blockObsidian.carverHelper.addVariation("Large obsidian pillar", 1, "obsidian/pillar"); blockObsidian.carverHelper.addVariation("Obsidian pillar", 2, "obsidian/pillar-quartz"); @@ -856,7 +853,7 @@ public class Chisel { Carving.chisel.addVariation("obsidian", blockObsidianSnakestone, 13, 17); if(config.get("general", "Add panes", true, "Changes pane rendering algorithm a bit.").getBoolean(true)){ - blockPaneIron = (BlockMarblePane) new BlockMarblePane(Material.iron, true).setHardness(0.3F).setStepSound(Block.soundTypeMetal); + blockPaneIron = (BlockCarvablePane) new BlockCarvablePane(Material.iron, true).setHardness(0.3F).setStepSound(Block.soundTypeMetal); blockPaneIron.carverHelper.addVariation("Iron bars", 0, Blocks.iron_bars); blockPaneIron.carverHelper.addVariation("Iron bars without frame", 1, "ironpane/fenceIron"); blockPaneIron.carverHelper.addVariation("Menacing iron bars", 2, "ironpane/barbedwire"); @@ -869,7 +866,7 @@ public class Chisel { blockPaneIron.carverHelper.addVariation("Iron spikes", 9, "ironpane/spikes"); blockPaneIron.carverHelper.register(blockPaneIron, "fenceIron"); - blockPaneGlass = (BlockMarblePane) new BlockMarblePane(Material.glass, false).setHardness(0.3F).setStepSound(Block.soundTypeGlass); + blockPaneGlass = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false).setHardness(0.3F).setStepSound(Block.soundTypeGlass); blockPaneGlass.carverHelper.addVariation("Glass pane", 0, Blocks.glass_pane); blockPaneGlass.carverHelper.addVariation("Bubble glass pane", 1, "glasspane/terrain-glassbubble"); blockPaneGlass.carverHelper.addVariation("Borderless glass pane", 2, "glasspane/terrain-glassnoborder"); @@ -933,7 +930,7 @@ public class Chisel { OreDictionary.registerOre("blockLavastone", blockLavastone); Carving.chisel.registerOre("blockLavastone","blockLavastone"); - blockFft=(BlockMarble) new BlockMarble(Material.rock).setHardness(2.0F).setResistance(10F); + blockFft=(BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); blockFft.carverHelper.setBlockName("Fantasy Block"); blockFft.carverHelper.addVariation("Fantasy brick", 0, "fft/brick"); blockFft.carverHelper.addVariation("Faded fantasy brick", 1, "fft/brick-faded"); @@ -955,7 +952,7 @@ public class Chisel { OreDictionary.registerOre("blockFft", blockFft); Carving.chisel.registerOre("blockFft","blockFft"); - blockCarpet=(BlockMarble) new BlockMarble(Material.cloth).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); + blockCarpet=(BlockCarvable) new BlockCarvable(Material.cloth).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); blockCarpet.carverHelper.setBlockName("Carpet Block"); blockCarpet.carverHelper.addVariation("White carpet block", 0, "carpet/white"); blockCarpet.carverHelper.addVariation("Orange carpet block", 1, "carpet/orange"); @@ -1007,7 +1004,7 @@ public class Chisel { Carving.needle.addVariation(group, blockCarpet, i, 1); } - blockBookshelf=(BlockMarble) new BlockMarbleBookshelf().setHardness(1.5F).setStepSound(Block.soundTypeWood); + blockBookshelf=(BlockCarvable) new BlockMarbleBookshelf().setHardness(1.5F).setStepSound(Block.soundTypeWood); blockBookshelf.carverHelper.addVariation("Bookshelf", 0, Blocks.bookshelf); blockBookshelf.carverHelper.addVariation("Bookshelf with rainbow colored books", 1, "bookshelf/rainbow"); blockBookshelf.carverHelper.addVariation("Necromancer novice's bookshelf", 2, "bookshelf/necromancer-novice"); @@ -1022,7 +1019,7 @@ public class Chisel { Carving.chisel.registerOre("blockBookshelf","blockBookshelf"); - blockTyrian=(BlockMarble) new BlockMarble(Material.iron).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + blockTyrian=(BlockCarvable) new BlockCarvable(Material.iron).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); blockTyrian.carverHelper.setBlockName("Futuristic Armor Plating Block"); blockTyrian.carverHelper.addVariation("Futuristic armor plating block", 0, "tyrian/shining"); blockTyrian.carverHelper.addVariation("Bleak futuristic armor plating block", 1, "tyrian/tyrian"); @@ -1044,7 +1041,8 @@ public class Chisel { OreDictionary.registerOre("blockTyrian", blockTyrian); Carving.chisel.registerOre("blockTyrian","blockTyrian"); - blockDirt = (BlockMarble) new BlockMarble(Material.ground).setHardness(0.5F).setStepSound(Block.soundTypeGravel); + blockDirt = (BlockCarvable) new BlockCarvable(Material.ground).setHardness(0.5F).setStepSound(Block.soundTypeGravel).setBlockName("dirt.default"); + blockDirt.carverHelper.setBlockName("Dirt"); blockDirt.carverHelper.addVariation("Dirt", 0, Blocks.dirt); blockDirt.carverHelper.addVariation("Dirt bricks in disarray", 1, "dirt/bricks"); blockDirt.carverHelper.addVariation("Dirt bricks imitating nether brick design", 2, "dirt/netherbricks"); @@ -1064,7 +1062,7 @@ public class Chisel { OreDictionary.registerOre("blockDirt", blockDirt); Carving.chisel.registerOre("blockDirt","blockDirt"); - blockTemple = (BlockMarble) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(soundTempleFootstep); + blockTemple = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(soundTempleFootstep); blockTemple.carverHelper.setBlockName("Temple Block"); blockTemple.carverHelper.addVariation("Temple cobblestone", 0, "temple/cobble"); blockTemple.carverHelper.addVariation("Orante temple block", 1, "temple/ornate"); @@ -1084,7 +1082,7 @@ public class Chisel { blockTemple.carverHelper.addVariation("Small light temple tiles", 15, "temple/smalltiles-light"); blockTemple.carverHelper.register(blockTemple, "blockTemple"); - blockTempleMossy=(BlockMarble) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(soundTempleFootstep); + blockTempleMossy=(BlockCarvable) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(soundTempleFootstep); blockTempleMossy.carverHelper.setBlockName("Mossy Temple Block"); blockTempleMossy.carverHelper.addVariation("Mossy temple cobblestone", 0, "templemossy/cobble"); blockTempleMossy.carverHelper.addVariation("Orante mossy temple block", 1, "templemossy/ornate"); @@ -1110,7 +1108,7 @@ public class Chisel { OreDictionary.registerOre("blockCloud", blockCloud); Carving.chisel.registerOre("blockCloud","blockCloud"); - blockFactory=(BlockMarble) new BlockMarble().setHardness(2.0F).setResistance(10F).setStepSound(soundMetalFootstep); + blockFactory=(BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(soundMetalFootstep); blockFactory.carverHelper.setBlockName("Factory Block"); blockFactory.carverHelper.addVariation("Rusty metal plate with dot pattern", 0, "factory/dots"); blockFactory.carverHelper.addVariation("Rusty metal plate", 1, "factory/rust2"); @@ -1130,6 +1128,31 @@ public class Chisel { blockFactory.carverHelper.addVariation("Weared metal column", 15, "factory/column"); blockFactory.carverHelper.register(blockFactory, "blockFactory"); + // 1.7! Let's go! Let's go-go! + /* + String[] sGNames = new String[]{ + "White", "Orange", "Magenta", "Light Blue", + "Yellow", "Lime", "Pink", "Gray", + "Light Gray", "Cyan", "Purple", "Blue", + "Brown", "Green", "Red", "Black" + }; + + for(int i = 0; i < 16; i++) { + String odName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); + String texName = "glassdyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; + int glassPrefix = 0; + int glassId = i; + blockStainedGlass[glassId] = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(0.3F).setStepSound(Block.soundTypeGlass); + blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " Stained Glass", glassPrefix + 0, Blocks.stained_glass, i); + blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " Bubble Stained Glass", glassPrefix + 1, texName + "bubble"); + blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " Stained Glass Panel", glassPrefix + 2, texName + "panel"); + blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " Fancy Stained Glass Panel", glassPrefix + 3, texName + "panel-fancy"); + blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " Small Stained Glass", glassPrefix + 4, texName + "quad"); + blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " Small Fancy Stained Glass", glassPrefix + 5, texName + "quad-fancy"); + blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " Borderless Stained Glass", glassPrefix + 6, texName + "transparent"); + blockStainedGlass[glassId].carverHelper.register(blockStainedGlass[glassId], "stainedGlass."+glassId, glassPrefix, glassPrefix+7); + } + */ Blocks.stone.setHarvestLevel("chisel", 0, 0); proxy.preInit(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/ProxyClient.java b/src/main/java/info/jbcs/minecraft/chisel/ProxyClient.java index 72c8b74c..a5fd26ee 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/ProxyClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ProxyClient.java @@ -2,7 +2,6 @@ package info.jbcs.minecraft.chisel; import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; -import info.jbcs.minecraft.chisel.item.ItemChiselRenderer; import info.jbcs.minecraft.chisel.render.BlockAdvancedMarbleRenderer; import info.jbcs.minecraft.chisel.render.BlockCarpetRenderer; import info.jbcs.minecraft.chisel.render.BlockEldritchRenderer; @@ -13,7 +12,8 @@ import info.jbcs.minecraft.chisel.render.BlockNoCTMRenderer; import info.jbcs.minecraft.chisel.render.BlockRoadLineRenderer; import info.jbcs.minecraft.chisel.render.BlockSnakeStoneRenderer; import info.jbcs.minecraft.chisel.render.BlockSpikesRenderer; -import info.jbcs.minecraft.utilities.BlockTexturedOreRenderer; +import info.jbcs.minecraft.chisel.render.BlockTexturedOreRenderer; +import info.jbcs.minecraft.chisel.render.ItemChiselRenderer; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/info/jbcs/minecraft/chisel/api/Carvable.java b/src/main/java/info/jbcs/minecraft/chisel/api/Carvable.java new file mode 100755 index 00000000..ca087821 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/api/Carvable.java @@ -0,0 +1,7 @@ +package info.jbcs.minecraft.chisel.api; + +import info.jbcs.minecraft.chisel.CarvableVariation; + +public interface Carvable { + public CarvableVariation getVariation(int metadata); +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarble.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java similarity index 85% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarble.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java index e282becc..3b41972f 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarble.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableHelper; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.Carvable; import java.util.List; @@ -15,14 +15,14 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class BlockMarble extends Block implements Carvable { +public class BlockCarvable extends Block implements Carvable { public CarvableHelper carverHelper; - public BlockMarble() { + public BlockCarvable() { this(Material.rock); } - public BlockMarble(Material m) { + public BlockCarvable(Material m) { super(m); carverHelper = new CarvableHelper(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockGlassCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java similarity index 86% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockGlassCarvable.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java index 288a853f..12e79d64 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockGlassCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableHelper; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.Carvable; import java.util.List; @@ -14,10 +14,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -public class BlockGlassCarvable extends BlockGlass implements Carvable { +public class BlockCarvableGlass extends BlockGlass implements Carvable { public CarvableHelper carverHelper; - public BlockGlassCarvable() { + public BlockCarvableGlass() { super(Material.glass, false); carverHelper = new CarvableHelper(); @@ -59,6 +59,4 @@ public class BlockGlassCarvable extends BlockGlass implements Carvable { public CarvableVariation getVariation(int metadata) { return carverHelper.getVariation(metadata); } - - } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePane.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java similarity index 84% rename from src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePane.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java index 3480ba08..7023c442 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePane.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableHelper; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.Carvable; import info.jbcs.minecraft.chisel.render.BlockMarblePaneRenderer; import java.util.List; @@ -16,10 +16,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -public class BlockMarblePane extends BlockPane implements Carvable { +public class BlockCarvablePane extends BlockPane implements Carvable { public CarvableHelper carverHelper; - public BlockMarblePane(Material material, boolean drops) { + public BlockCarvablePane(Material material, boolean drops) { super("", "", material, drops); carverHelper = new CarvableHelper(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java index 40b4c7d4..88d88016 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java @@ -10,7 +10,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockCloud extends BlockMarble { +public class BlockCloud extends BlockCarvable { public BlockCloud() { super(Material.ice); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java index 725821bb..6d671d70 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -public class BlockConcrete extends BlockMarble { +public class BlockConcrete extends BlockCarvable { public BlockConcrete() { super(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java index c15335c8..09a4c666 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java @@ -3,7 +3,7 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.Chisel; -public class BlockEldritch extends BlockMarble { +public class BlockEldritch extends BlockCarvable { public BlockEldritch() { super(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java index 9458dc48..e7f2aef6 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java @@ -10,7 +10,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class BlockHolystone extends BlockMarble{ +public class BlockHolystone extends BlockCarvable{ public IIcon iconStar; public BlockHolystone(Material m) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java index 34ab1ee7..82e15dd4 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java @@ -8,7 +8,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -public class BlockLightstoneCarvable extends BlockMarble { +public class BlockLightstoneCarvable extends BlockCarvable { public BlockLightstoneCarvable() { super(Material.glass); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java index c2e7036f..b34c8fe6 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockMarbleBookshelf extends BlockMarble { +public class BlockMarbleBookshelf extends BlockCarvable { public BlockMarbleBookshelf() { super(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java index 72eb568e..005e2acc 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableHelper; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.Carvable; import java.util.List; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java index 446ad58c..5f6ed846 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableHelper; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.Carvable; import java.util.List; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java index 819e5216..a395cdda 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -public class BlockMarbleLamp extends BlockMarble { +public class BlockMarbleLamp extends BlockCarvable { BlockMarbleLamp blockUnpowered; BlockMarbleLamp blockPowered; boolean powered; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java index 7529f3e3..9b80d392 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java @@ -6,7 +6,7 @@ import net.minecraft.block.material.Material; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -public class BlockMarblePillar extends BlockMarble{ +public class BlockMarblePillar extends BlockCarvable{ public IIcon sides[]=new IIcon[6]; public BlockMarblePillar(Material m) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java index 5656a178..e9fe2d9f 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java @@ -16,13 +16,13 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockMarbleSlab extends BlockMarble { +public class BlockMarbleSlab extends BlockCarvable { public Block master; public BlockMarbleSlab bottom; public BlockMarbleSlab top; public boolean isBottom; - public BlockMarbleSlab(BlockMarble marble) { + public BlockMarbleSlab(BlockCarvable marble) { opaque = true; setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java index b35af671..91eb72e7 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableHelper; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.Carvable; import info.jbcs.minecraft.chisel.render.BlockMarbleStairsRenderer; import java.util.List; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java index 55da84a7..5c1a1666 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java @@ -1,10 +1,9 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableHelper; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.utilities.BlockTexturedOre; +import info.jbcs.minecraft.chisel.api.Carvable; import java.util.List; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockPoweredMarble.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockPoweredMarble.java index d4f50724..17a6db46 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockPoweredMarble.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockPoweredMarble.java @@ -3,7 +3,7 @@ package info.jbcs.minecraft.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; -public class BlockPoweredMarble extends BlockMarble { +public class BlockPoweredMarble extends BlockCarvable { public BlockPoweredMarble(Material m) { super(m); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java new file mode 100644 index 00000000..fffe69c2 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java @@ -0,0 +1,55 @@ +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.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; + +public class BlockTexturedOre extends Block { + public int currentPass; + public Block base; + public IIcon icon; + String iconFile; + + public BlockTexturedOre(Material mat, Block base) { + super(mat); + + this.base = base; + } + + public BlockTexturedOre(Material mat, String iconFile) { + super(mat); + + this.iconFile=iconFile; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public int getRenderType() { + return BlockTexturedOreRenderer.id; + } + + @Override + public int getRenderBlockPass() { + return 1; + } + + @Override + public boolean canRenderInPass(int pass) { + currentPass = pass; + + return pass == 1 || pass == 0; + } + + @Override + public void registerBlockIcons(IIconRegister register) { + if(iconFile!=null) + icon=register.registerIcon(iconFile); + } + +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/GuiChisel.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/GuiChisel.java index c4575242..e39ba4a1 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/GuiChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/GuiChisel.java @@ -68,14 +68,4 @@ public class GuiChisel extends GuiContainer { GeneralClient.bind(texture); drawTexturedModalRect(i, j, 0, 0, xSize, ySize); } - - @Override - public void initGui() { - super.initGui(); - } - - @Override - protected void actionPerformed(GuiButton guibutton) { - super.actionPerformed(guibutton); - } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java index bfe4ebd3..bb3617e6 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java @@ -2,27 +2,33 @@ package info.jbcs.minecraft.chisel.inventory; import info.jbcs.minecraft.chisel.item.ItemChisel; import info.jbcs.minecraft.utilities.General; -import info.jbcs.minecraft.utilities.InventoryStatic; import java.util.ArrayList; +import pl.asie.lib.block.InventoryBase; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class InventoryChiselSelection extends InventoryStatic { +public class InventoryChiselSelection extends InventoryBase { ItemStack chisel = null; final static int normalSlots=32; int activeVariations=0; ContainerChisel container; public InventoryChiselSelection(ItemStack c) { - super(normalSlots+1); + super(); chisel = c; } + @Override + public int getSizeInventory() { + return normalSlots+1; + } + @Override public String getInventoryName() { return "Carve blocks"; @@ -33,23 +39,19 @@ public class InventoryChiselSelection extends InventoryStatic { return true; } - @Override - public void onInventoryChanged() { - } - public void clearItems() { activeVariations=0; for (int i = 0; i < normalSlots; i++) { - items[i] = null; + inventory[i] = null; } } public ItemStack getStackInSpecialSlot() { - return items[normalSlots]; + return inventory[normalSlots]; } public void updateItems() { - ItemStack chiseledItem = items[normalSlots]; + ItemStack chiseledItem = inventory[normalSlots]; clearItems(); @@ -68,7 +70,7 @@ public class InventoryChiselSelection extends InventoryStatic { activeVariations=0; while(activeVariations0) crafted.stackSize--; @@ -40,9 +40,9 @@ public class SlotChiselSelection extends Slot { player.inventory.setItemStack(null); - if(selInventory.items[InventoryChiselSelection.normalSlots]==null) return; + if(selInventory.inventory[InventoryChiselSelection.normalSlots]==null) return; - player.inventory.setItemStack(new ItemStack(itemstack.getItem(), selInventory.items[InventoryChiselSelection.normalSlots].stackSize, itemstack.getItemDamage())); + player.inventory.setItemStack(new ItemStack(itemstack.getItem(), selInventory.inventory[InventoryChiselSelection.normalSlots].stackSize, itemstack.getItemDamage())); selInventory.setInventorySlotContents(InventoryChiselSelection.normalSlots,null); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java index 71498876..8de0cbc2 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java @@ -1,8 +1,8 @@ package info.jbcs.minecraft.chisel.item; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.Carvable; import info.jbcs.minecraft.utilities.General; import java.util.List; diff --git a/src/main/java/info/jbcs/minecraft/chisel/render/BlockAdvancedMarbleRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/render/BlockAdvancedMarbleRenderer.java index 21b77cb9..11ddae76 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/render/BlockAdvancedMarbleRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/render/BlockAdvancedMarbleRenderer.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.render; -import info.jbcs.minecraft.chisel.Carvable; import info.jbcs.minecraft.chisel.CarvableHelper; import info.jbcs.minecraft.chisel.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.Carvable; import info.jbcs.minecraft.utilities.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/render/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/render/BlockTexturedOreRenderer.java new file mode 100644 index 00000000..c5e71bab --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/render/BlockTexturedOreRenderer.java @@ -0,0 +1,77 @@ +package info.jbcs.minecraft.chisel.render; + +import info.jbcs.minecraft.chisel.block.BlockTexturedOre; +import info.jbcs.minecraft.utilities.Drawing; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.init.Blocks; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class BlockTexturedOreRenderer implements ISimpleBlockRenderingHandler { + float bot=-0.001f,top=1.0f-bot; + public static int id; + + public BlockTexturedOreRenderer() { + id = RenderingRegistry.getNextAvailableRenderId(); + } + + @Override + public void renderInventoryBlock(Block blck, int meta, int modelID, RenderBlocks renderer) { + if (blck == null || !(blck instanceof BlockTexturedOre)) + return; + + BlockTexturedOre block=(BlockTexturedOre) blck; + + if(block.icon!=null){ + renderer.overrideBlockTexture=block.icon; + renderer.renderBlockAsItem(Blocks.stone,meta,1.0f); + renderer.overrideBlockTexture=null; + } else if(block.base!=null){ + renderer.renderBlockAsItem(block.base,meta,1.0f); + } + + GL11.glEnable(3042); + GL11.glBlendFunc(770, 771); + renderer.setRenderBounds(bot, bot, bot, top, top, top); + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + Drawing.drawBlock(block, meta, renderer); + GL11.glDisable(3042); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block blck, int modelId, RenderBlocks renderer) { + if (blck == null || !(blck instanceof BlockTexturedOre)) + return false; + BlockTexturedOre block=(BlockTexturedOre) blck; + + if(block.currentPass==0){ + if(block.icon!=null){ + renderer.overrideBlockTexture=block.icon; + renderer.renderStandardBlock(block, x, y, z); + renderer.overrideBlockTexture=null; + } else if(block.base!=null){ + renderer.renderBlockByRenderType(block.base, x, y, z); + } + } else{ + renderer.setRenderBounds(bot, bot, bot, top, top, top); + renderer.renderStandardBlock(block, x, y, z); + } + + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return id; + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChiselRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/render/ItemChiselRenderer.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/item/ItemChiselRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/render/ItemChiselRenderer.java index dc435374..7822f57c 100755 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChiselRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/render/ItemChiselRenderer.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.render; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/render/TextureStitchFinishedEvent.java b/src/main/java/info/jbcs/minecraft/chisel/render/TextureStitchFinishedEvent.java deleted file mode 100755 index b2435fd7..00000000 --- a/src/main/java/info/jbcs/minecraft/chisel/render/TextureStitchFinishedEvent.java +++ /dev/null @@ -1,8 +0,0 @@ -package info.jbcs.minecraft.chisel.render; - -import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.client.renderer.texture.TextureMap; - -public class TextureStitchFinishedEvent extends Event { - public TextureMap map; -} diff --git a/src/main/java/info/jbcs/minecraft/gui/ContainerPickBlock.java b/src/main/java/info/jbcs/minecraft/gui/ContainerPickBlock.java deleted file mode 100644 index ea841ed7..00000000 --- a/src/main/java/info/jbcs/minecraft/gui/ContainerPickBlock.java +++ /dev/null @@ -1,99 +0,0 @@ -package info.jbcs.minecraft.gui; - -import info.jbcs.minecraft.utilities.InventoryStatic; - -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ContainerPickBlock extends Container -{ - ArrayList items = new ArrayList(); - GuiPickBlock gui; - EntityPlayer player; - int width = 9; - int height = 7; - - SlotPickBlock resultSlot; - - public ContainerPickBlock(EntityPlayer p) - { - for (Object o : Item.itemRegistry.getKeys()) - { - Item item = (Item)Item.itemRegistry.getObject((String)o); - - if (item != null && item.getCreativeTab() != null) - { - item.getSubItems(item, null, items); - } - } - - int index = 0; - - for (int y = 0; y < height; y++) - { - for (int x = 0; x < width; x++) - { - addSlotToContainer(new SlotPickBlock(this, index++, 9 + x * 18, 18 + y * 18)); - } - } - - addSlotToContainer(resultSlot = new SlotPickBlock(this, index++, 18, 153)); - player = p; - scrollTo(0); - } - - public InventoryStatic inventory = new InventoryStatic(width * height + 1) - { - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) - { - return false; - } - }; - - public void scrollTo(float offset) - { - int columnsNotFitting = items.size() / width - height + 1; - - if (columnsNotFitting < 0) - { - columnsNotFitting = 0; - } - - int columnOffset = (int)(offset * columnsNotFitting + 0.5D); - - for (int y = 0; y < height; ++y) - { - for (int x = 0; x < width; ++x) - { - int index = x + (y + columnOffset) * width; - - if (index >= 0 && index < items.size()) - { - inventory.setInventorySlotContents(x + y * width, items.get(index)); - } - else - { - inventory.setInventorySlotContents(x + y * width, (ItemStack) null); - } - } - } - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) - { - SlotPickBlock slot = (SlotPickBlock) this.inventorySlots.get(index); - return slot.transferStackInSlot(player); - } - - @Override - public boolean canInteractWith(EntityPlayer entityplayer) - { - return true; - } -} diff --git a/src/main/java/info/jbcs/minecraft/gui/GuiPickBlock.java b/src/main/java/info/jbcs/minecraft/gui/GuiPickBlock.java deleted file mode 100644 index 7c739cc4..00000000 --- a/src/main/java/info/jbcs/minecraft/gui/GuiPickBlock.java +++ /dev/null @@ -1,114 +0,0 @@ -package info.jbcs.minecraft.gui; - - -import info.jbcs.minecraft.utilities.GeneralClient; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -public class GuiPickBlock extends GuiContainer -{ - Scrollbar scrollbar; - ContainerPickBlock container; - GuiScreen parent; - - public GuiPickBlock(EntityPlayer player, ItemStack stack, GuiScreen screen) - { - super(new ContainerPickBlock(player)); - ySize = 185; - xSize = 195; - container = (ContainerPickBlock) inventorySlots; - container.gui = this; - parent = screen; - container.resultSlot.putStack(stack); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float f, int x, int y) - { - GeneralClient.bind("vending:textures/list_items.png"); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - scrollbar.drawButton(mc, x, y); - } - - @Override - public void handleMouseInput() - { - super.handleMouseInput(); - scrollbar.handleMouseInput(); - } - - /** - * Adds the buttons (and other controls) to the screen in question. - */ - @Override - public void initGui() - { - super.initGui(); - buttonList.add(scrollbar = new Scrollbar(200, guiLeft + 175, guiTop + 18, 12, 124, "") - { - @Override - public void onScrolled(float off) - { - int columnsNotFitting = container.items.size() / container.width - container.height + 1; - - if (columnsNotFitting < 0) - { - columnsNotFitting = 0; - } - - if (columnsNotFitting == 0) - { - scrollbar.active = false; - scrollbar.offset = 0; - } - else - { - scrollbar.active = true; - scrollbar.step = 1.0f / columnsNotFitting; - } - - container.scrollTo(off); - } - }); - buttonList.add(new GuiButton(100, guiLeft + 44, guiTop + 151, 70, 20, "Select")); - } - - public void picked(ItemStack stack) - { - if (parent == null) - { - return; - } - - if (parent instanceof IPickBlockHandler) - { - ((IPickBlockHandler) parent).blockPicked(stack); - } - } - - /** - * Fired when a control is clicked. This is the equivalent of - * ActionListener.actionPerformed(ActionEvent e). - */ - @Override - protected void actionPerformed(GuiButton button) - { - switch (button.id) - { - case 100: - ItemStack stack = container.resultSlot.getStack(); - - if (parent instanceof IPickBlockHandler) - { - ((IPickBlockHandler) parent).blockPicked(stack); - } - - Minecraft.getMinecraft().displayGuiScreen(parent); - break; - } - } -} diff --git a/src/main/java/info/jbcs/minecraft/gui/IPickBlockHandler.java b/src/main/java/info/jbcs/minecraft/gui/IPickBlockHandler.java deleted file mode 100644 index 67b35c3d..00000000 --- a/src/main/java/info/jbcs/minecraft/gui/IPickBlockHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package info.jbcs.minecraft.gui; - -import net.minecraft.item.ItemStack; - -public interface IPickBlockHandler { - void blockPicked(ItemStack stack); -} diff --git a/src/main/java/info/jbcs/minecraft/gui/SlotPickBlock.java b/src/main/java/info/jbcs/minecraft/gui/SlotPickBlock.java deleted file mode 100644 index 9269ac4b..00000000 --- a/src/main/java/info/jbcs/minecraft/gui/SlotPickBlock.java +++ /dev/null @@ -1,73 +0,0 @@ -package info.jbcs.minecraft.gui; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class SlotPickBlock extends Slot -{ - ContainerPickBlock container; - - public SlotPickBlock(ContainerPickBlock c, int index, int x, int y) - { - super(c.inventory, index, x, y); - container = c; - } - - void click(EntityPlayer player, ItemStack itemstack, int count) - { - player.inventory.setItemStack(null); - - if (itemstack == null) - { - return; - } - - if (container.gui == null) - { - return; - } - - putStack(new ItemStack(itemstack.getItem(), itemstack.stackSize, itemstack.getItemDamage())); - int newSize; - - if (container.resultSlot == this) - { - newSize = itemstack.stackSize - count; - } - else - { - newSize = itemstack.stackSize; - ItemStack otherstack = container.resultSlot.getStack(); - - if (otherstack != null && otherstack.getItem().equals(itemstack.getItem()) && otherstack.getItemDamage() == itemstack.getItemDamage()) - { - newSize = otherstack.stackSize + count; - } - else - { - newSize = count; - } - } - - if (newSize > 64) - { - newSize = 64; - } - - container.resultSlot.putStack(newSize <= 0 ? null : new ItemStack(itemstack.getItem(), newSize, itemstack.getItemDamage())); - } - - @Override - public void onPickupFromSlot(EntityPlayer player, ItemStack itemstack) - { - super.onPickupFromSlot(player, itemstack); - click(player, itemstack, 1); - } - - public ItemStack transferStackInSlot(EntityPlayer player) - { - click(player, getStack(), 64); - return null; - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-bubble.png new file mode 100644 index 00000000..9979b81c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-panel-fancy.png new file mode 100644 index 00000000..864b5f8f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-panel.png new file mode 100644 index 00000000..85fe5aa2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-quad-fancy.png new file mode 100644 index 00000000..fd4ad1a4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-quad.png new file mode 100644 index 00000000..35f23d71 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-transparent.png new file mode 100644 index 00000000..00917175 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/black-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-bubble.png new file mode 100644 index 00000000..d95c7388 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-panel-fancy.png new file mode 100644 index 00000000..3f702c2f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-panel.png new file mode 100644 index 00000000..6a26096e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-quad-fancy.png new file mode 100644 index 00000000..319d7e5b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-quad.png new file mode 100644 index 00000000..42e1b039 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-transparent.png new file mode 100644 index 00000000..12228bda Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/blue-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-bubble.png new file mode 100644 index 00000000..c9fa40ed Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-panel-fancy.png new file mode 100644 index 00000000..aa353abc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-panel.png new file mode 100644 index 00000000..f5f024f9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-quad-fancy.png new file mode 100644 index 00000000..e9470231 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-quad.png new file mode 100644 index 00000000..4bc58f74 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-transparent.png new file mode 100644 index 00000000..5014aba8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/brown-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-bubble.png new file mode 100644 index 00000000..f475b600 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-panel-fancy.png new file mode 100644 index 00000000..9cc9a56f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-panel.png new file mode 100644 index 00000000..6180e680 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-quad-fancy.png new file mode 100644 index 00000000..443a9f06 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-quad.png new file mode 100644 index 00000000..be4fa192 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-transparent.png new file mode 100644 index 00000000..5fc88922 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/cyan-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-bubble.png new file mode 100644 index 00000000..c5b1d4fa Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-panel-fancy.png new file mode 100644 index 00000000..257c7aee Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-panel.png new file mode 100644 index 00000000..2bb6b5c7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-quad-fancy.png new file mode 100644 index 00000000..a2ff31fb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-quad.png new file mode 100644 index 00000000..debc304a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-transparent.png new file mode 100644 index 00000000..41763396 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/gray-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-bubble.png new file mode 100644 index 00000000..0ea06321 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-panel-fancy.png new file mode 100644 index 00000000..37079bc0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-panel.png new file mode 100644 index 00000000..a4c8accd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-quad-fancy.png new file mode 100644 index 00000000..8f68541e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-quad.png new file mode 100644 index 00000000..40a858a0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-transparent.png new file mode 100644 index 00000000..bdf1122f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/green-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-bubble.png new file mode 100644 index 00000000..4d7f5b17 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-panel-fancy.png new file mode 100644 index 00000000..f91dd7c9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-panel.png new file mode 100644 index 00000000..c1bab16a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-quad-fancy.png new file mode 100644 index 00000000..8ec5f39c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-quad.png new file mode 100644 index 00000000..f23507a4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-transparent.png new file mode 100644 index 00000000..c60fd1d4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightblue-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-bubble.png new file mode 100644 index 00000000..a437235d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-panel-fancy.png new file mode 100644 index 00000000..af4291c4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-panel.png new file mode 100644 index 00000000..913db31e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-quad-fancy.png new file mode 100644 index 00000000..ecd3875a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-quad.png new file mode 100644 index 00000000..5a570076 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-transparent.png new file mode 100644 index 00000000..b36053bd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lightgray-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-bubble.png new file mode 100644 index 00000000..89b4ff93 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-panel-fancy.png new file mode 100644 index 00000000..6e48d355 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-panel.png new file mode 100644 index 00000000..733b6f8d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-quad-fancy.png new file mode 100644 index 00000000..80458217 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-quad.png new file mode 100644 index 00000000..2335999e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-transparent.png new file mode 100644 index 00000000..fc4fcaa6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/lime-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-bubble.png new file mode 100644 index 00000000..c59417dc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-panel-fancy.png new file mode 100644 index 00000000..8b28df3e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-panel.png new file mode 100644 index 00000000..8287c409 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-quad-fancy.png new file mode 100644 index 00000000..b8b8efcb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-quad.png new file mode 100644 index 00000000..370f81fb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-transparent.png new file mode 100644 index 00000000..af658add Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/magenta-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-bubble.png new file mode 100644 index 00000000..466e23dc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-panel-fancy.png new file mode 100644 index 00000000..31ef9450 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-panel.png new file mode 100644 index 00000000..5489bb5c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-quad-fancy.png new file mode 100644 index 00000000..9dd1718e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-quad.png new file mode 100644 index 00000000..2e5d96ba Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-transparent.png new file mode 100644 index 00000000..40109a1e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/orange-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-bubble.png new file mode 100644 index 00000000..141d878d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-panel-fancy.png new file mode 100644 index 00000000..a8443b18 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-panel.png new file mode 100644 index 00000000..4b2eaabc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-quad-fancy.png new file mode 100644 index 00000000..647ae337 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-quad.png new file mode 100644 index 00000000..ce0149cc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-transparent.png new file mode 100644 index 00000000..61b5889a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/pink-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-bubble.png new file mode 100644 index 00000000..44ece33b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-panel-fancy.png new file mode 100644 index 00000000..0467e514 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-panel.png new file mode 100644 index 00000000..994ea22c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-quad-fancy.png new file mode 100644 index 00000000..399f86c1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-quad.png new file mode 100644 index 00000000..0e8187f3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-transparent.png new file mode 100644 index 00000000..e7c77078 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/purple-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-bubble.png new file mode 100644 index 00000000..d6d84fd0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-panel-fancy.png new file mode 100644 index 00000000..45421474 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-panel.png new file mode 100644 index 00000000..981e56d2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-quad-fancy.png new file mode 100644 index 00000000..8c837fce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-quad.png new file mode 100644 index 00000000..3828c5b0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-transparent.png new file mode 100644 index 00000000..e8bbf3d3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/red-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-bubble.png new file mode 100644 index 00000000..ef8c9ad1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-panel-fancy.png new file mode 100644 index 00000000..ba93efca Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-panel.png new file mode 100644 index 00000000..17405ada Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-quad-fancy.png new file mode 100644 index 00000000..2f32a86e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-quad.png new file mode 100644 index 00000000..ff49a401 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-transparent.png new file mode 100644 index 00000000..176f6aa8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/white-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-bubble.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-bubble.png new file mode 100644 index 00000000..37830d52 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-bubble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-panel-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-panel-fancy.png new file mode 100644 index 00000000..d7bb5ff1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-panel-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-panel.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-panel.png new file mode 100644 index 00000000..eebd11d0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-quad-fancy.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-quad-fancy.png new file mode 100644 index 00000000..6e0d8206 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-quad-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-quad.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-quad.png new file mode 100644 index 00000000..a5c08300 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-quad.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-transparent.png b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-transparent.png new file mode 100644 index 00000000..f792b15d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glassdyed/yellow-transparent.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/clean.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/clean.png new file mode 100644 index 00000000..cce3a45e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/clean.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/crate-fancy.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/crate-fancy.png new file mode 100644 index 00000000..493ddb45 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/crate-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/crate.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/crate.png new file mode 100644 index 00000000..cd26eadf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/crate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/double-side.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/double-side.png new file mode 100644 index 00000000..7860fff9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/double-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/double-top.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/double-top.png new file mode 100644 index 00000000..ad37c9ab Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/double-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/fancy.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/fancy.png new file mode 100644 index 00000000..b8a22736 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/large.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/large.png new file mode 100644 index 00000000..7860fff9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/panel-nails.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/panel-nails.png new file mode 100644 index 00000000..ad37c9ab Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/panel-nails.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-acacia/short.png b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/short.png new file mode 100644 index 00000000..b9ea5cfe Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-acacia/short.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/clean.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/clean.png new file mode 100644 index 00000000..aa58fe3e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/clean.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/crate-fancy.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/crate-fancy.png new file mode 100644 index 00000000..fde3611e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/crate-fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/crate.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/crate.png new file mode 100644 index 00000000..f9a4b4cd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/crate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/double-side.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/double-side.png new file mode 100644 index 00000000..507d2e36 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/double-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/double-top.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/double-top.png new file mode 100644 index 00000000..5ce48195 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/double-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/fancy.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/fancy.png new file mode 100644 index 00000000..3cd291ee Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/fancy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/large.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/large.png new file mode 100644 index 00000000..507d2e36 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/panel-nails.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/panel-nails.png new file mode 100644 index 00000000..5ce48195 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/panel-nails.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/short.png b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/short.png new file mode 100644 index 00000000..cebc8c06 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/planks-dark-oak/short.png differ diff --git a/src/main/resources/chisel_at.cfg b/src/main/resources/chisel_at.cfg deleted file mode 100644 index 2ea910be..00000000 --- a/src/main/resources/chisel_at.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# tesselator offsets -public net.minecraft.client.renderer.Tessellator field_78408_v -public net.minecraft.client.renderer.Tessellator field_78407_w -public net.minecraft.client.renderer.Tessellator field_78417_x - -# blockHardness, blockResistance -public net.minecraft.block.Block field_149782_v -public net.minecraft.block.Block field_149781_w -