diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 577879e8..894479e5 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -58,6 +58,7 @@ public class Chisel public static int particlesTickrate; public static boolean blockDescriptions; public static boolean ghostCloud; + public static int factoryBlockAmount; public static final StepSoundEx soundHolystoneFootstep = new StepSoundEx("chisel:holystone", "chisel:holystone", "chisel:holystone", 1.0f); public static final StepSoundEx soundTempleFootstep = new StepSoundEx("dig.stone", "chisel:temple-footstep", "dig.stone", 1.0f); @@ -188,7 +189,7 @@ public class Chisel chiselStoneToCobbleBricks = config.get("general", "chiselStoneToCobbleBricks", true, "Chisel stone to cobblestone and bricks by left-click.").getBoolean(true); enableChiseling = config.get("general", "enableChiselingLeftClicking", false, "Change blocks to another block using the Chisel and left-click.").getBoolean(false); ghostCloud = config.get("general", "doesCloudRenderLikeGhost", true).getBoolean(true); - //iceMelt = config.get("general", "doesIceMeltIntoWater", true).getBoolean(true); + factoryBlockAmount = config.get("general", "amountYouGetFromFactoryBlockCrafting", 32).getInt(32); if(config.hasChanged()) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index 72bbb834..c320691f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -1134,8 +1134,9 @@ public class ChiselBlocks if(Chisel.featureEnabled("glassStained")) for(int i = 0; i < 16; i++) { - String blockName = "chisel.stainedGlass" + sGNames[i].replaceAll(" ", ""); - String oreName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); + String nameWithoutSpace = sGNames[i].replaceAll(" ", ""); + String blockName = "chisel.stainedGlass" + nameWithoutSpace; + String oreName = "stainedGlass" + nameWithoutSpace; String texName = "glassdyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; int glassPrefix = (i & 3) << 2; int glassId = i >> 2; @@ -1145,7 +1146,7 @@ public class ChiselBlocks blockStainedGlass[glassId].carverHelper.registerBlock(blockStainedGlass[glassId], blockName); blockStainedGlass[glassId].carverHelper.blockName = "Stained Glass"; } - blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix + 0, texName + "bubble"); + blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix, texName + "bubble"); blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " glass panel", glassPrefix + 1, texName + "panel"); blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " fancy glass panel", glassPrefix + 2, texName + "panel-fancy"); blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " borderless glass", glassPrefix + 3, texName + "transparent"); @@ -1153,7 +1154,8 @@ public class ChiselBlocks Carving.chisel.registerOre(blockName, oreName); for(CarvableVariation cv : blockStainedGlass[glassId].carverHelper.variations) { - if(cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 4) continue; + if(cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 4) + continue; blockStainedGlass[glassId].carverHelper.registerVariation(blockName, cv, blockStainedGlass[glassId], cv.metadata); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index 9ed83fb3..cd285af8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -42,7 +42,7 @@ public class Crafting GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFft, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1)}); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockTyrian, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)}); GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockTemple, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFactory, 32, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)}); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFactory, Chisel.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)}); if(Chisel.config.get("general", "chiselAlternateRecipe", false, "Use alternative crafting recipe for the chisel").getBoolean(false)) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java index 7e082cd1..ab284e2a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java @@ -1,14 +1,11 @@ package info.jbcs.minecraft.chisel.block; -import info.jbcs.minecraft.chisel.api.ICarvable; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.Chisel; - -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; import net.minecraft.block.BlockGlass; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,6 +13,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; +import java.util.List; + public class BlockCarvableGlass extends BlockGlass implements ICarvable { public CarvableHelper carverHelper; @@ -26,7 +25,6 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable super(Material.glass, false); carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 0d8a2a8e..46e4fa70 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -260,18 +260,18 @@ chisel.tile.blockFactory.15.desc=Weared Metal Column #Diamond blocks chisel.tile.diamond.name=Diamond Block -chisel.tile.diamond.0.desc=Embossed Diamond Block -chisel.tile.diamond.1.desc=Diamond Block with Panel -chisel.tile.diamond.2.desc=Diamond Cells -chisel.tile.diamond.3.desc=Diamonds in Purple Obsidian -chisel.tile.diamond.4.desc=Diamonds in Obsidian -chisel.tile.diamond.5.desc=Simple Diamond Block -chisel.tile.diamond.6.desc=Bismuth -chisel.tile.diamond.7.desc=Crushed Diamond -chisel.tile.diamond.8.desc=Small Diamond Blocks -chisel.tile.diamond.9.desc=Small Ornate Diamond Blocks -chisel.tile.diamond.10.desc=Zelda Diamond Block -chisel.tile.diamond.11.desc=Diamond Block with Ornate Layer +chisel.tile.diamond.1.desc=Embossed Diamond Block +chisel.tile.diamond.2.desc=Diamond Block with Panel +chisel.tile.diamond.3.desc=Diamond Cells +chisel.tile.diamond.4.desc=Diamonds in Purple Obsidian +chisel.tile.diamond.5.desc=Diamonds in Obsidian +chisel.tile.diamond.6.desc=Simple Diamond Block +chisel.tile.diamond.7.desc=Bismuth +chisel.tile.diamond.8.desc=Crushed Diamond +chisel.tile.diamond.9.desc=Small Diamond Blocks +chisel.tile.diamond.10.desc=Small Ornate Diamond Blocks +chisel.tile.diamond.11.desc=Zelda Diamond Block +chisel.tile.diamond.12.desc=Diamond Block with Ornate Layer #Snakestone chisel.tile.snakestoneSand.name=Sand Snakestone @@ -536,6 +536,14 @@ chisel.tile.icePillar.15.desc=Plain ice pillar ornate base #Ice Stairs chisel.tile.iceStairs.name=Ice Stairs +chisel.tile.chisel.iceStairs.0.name=Ice Stairs +chisel.tile.chisel.iceStairs.1.name=Ice Stairs +chisel.tile.chisel.iceStairs.2.name=Ice Stairs +chisel.tile.chisel.iceStairs.3.name=Ice Stairs +chisel.tile.chisel.iceStairs.4.name=Ice Stairs +chisel.tile.chisel.iceStairs.5.name=Ice Stairs +chisel.tile.chisel.iceStairs.6.name=Ice Stairs +chisel.tile.chisel.iceStairs.7.name=Ice Stairs chisel.tile.iceStairs.0.desc=Ice Stairs chisel.tile.iceStairs.1.desc=Rough ice stairs chisel.tile.iceStairs.2.desc=Cobbleice stairs @@ -571,6 +579,97 @@ chisel.tile.obsidian.13.desc=Obsidian tiles chisel.tile.obsidian.14.desc=Light obsidian blocks with Greek decor chisel.tile.obsidian.15.desc=Small obsidian blocks inside an oak wood crate +#Wood +chisel.tile.wood-oak.name=Oak Wood +chisel.tile.wood-birch.name=Birch Wood +chisel.tile.wood-spruce.name=Spruce Wood +chisel.tile.wood-jungle.name=Jungle Wood +chisel.tile.wood-dark-oak.name=Dark Oak Wood +chisel.tile.wood-acacia.name=Acacia Wood + +#Remember to do the descriptions. + +#Obsidian Snakestone +chisel.tile.obsidianSnakestone.name=Obsidian Snakestone + +#Iron Fence +chisel.tile.fenceIron=Iron Bars + +#Glass Panes +chisel.tile.glassPane=Glass Pane + +#Redstone block +chisel.tile.blockRedstone.name=Redstone Block + +#Holystone +chisel.tile.blockHolystone.name=Holystone + +#Lavastone +chisel.tile.blockLavastone.name=Lavastone + +#Carpet +chisel.tile.blockCarpet.name=Carpet + +#Carpet floor +chisel.tile.blockCarpetFloor.name=Floor Carpet + +#Bookshelf +chisel.tile.blockBookshelf.name=Bookshelf + +#Tyrian +chisel.tile.blockTyrian.name=Tyrian + +#Temple +chisel.tile.blockTemple.name=Temple Block + +#Temple Mossy +chisel.tile.blockTempleMossy.name=Mossy Temple Block + +#Cloud +chisel.tile.blockCloud.name=Cloud + +#Stained glass T.T +chisel.tile.chisel.stainedGlassWhite.name=Stained Glass +chisel.tile.chisel.stainedGlassOrange.name=Stained Glass +chisel.tile.chisel.stainedGlassMagenta.name=Stained Glass +chisel.tile.chisel.stainedGlassLightBlue.name=Stained Glass +chisel.tile.chisel.stainedGlassYellow.name=Stained Glass +chisel.tile.chisel.stainedGlassLime.name=Stained Glass +chisel.tile.chisel.stainedGlassPink.name=Stained Glass +chisel.tile.chisel.stainedGlassGray.name=Stained Glass +chisel.tile.chisel.stainedGlassLightGray.name=Stained Glass +chisel.tile.chisel.stainedGlassCyan.name=Stained Glass +chisel.tile.chisel.stainedGlassPurple.name=Stained Glass +chisel.tile.chisel.stainedGlassBlue.name=Stained Glass +chisel.tile.chisel.stainedGlassBrown.name=Stained Glass +chisel.tile.chisel.stainedGlassGreen.name=Stained Glass +chisel.tile.chisel.stainedGlassRed.name=Stained Glass +chisel.tile.chisel.stainedGlassBlack.name=Stained Glass + +#Stained GlassPane T.T +chisel.tile.chisel.stainedGlassPaneWhite.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneOrange.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneMagenta.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneLightBlue.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneYellow.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneLime.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPanePink.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneGray.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneLightGray.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneCyan.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPanePurple.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneBlue.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneBrown.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneGreen.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneRed.name=Stained Glass Pane +chisel.tile.chisel.stainedGlassPaneBlack.name=Stained Glass Pane + +#Concerete +chisel.tile.concrete.name=Concrete + +#Fantasy block +chisel.tile.blockFft.name=Fantasy Block + # Creative Tab localizations itemGroup.tabChisel=Chisel Blocks