From 1df88f558763dee6f7b84b8bc4857e25f3de6729 Mon Sep 17 00:00:00 2001 From: Fenn Date: Fri, 23 May 2014 22:44:19 +0100 Subject: [PATCH] Fixed a minor bug --- build.gradle | 2 +- .../info/jbcs/minecraft/chisel/Chisel.java | 7 ++--- .../jbcs/minecraft/chisel/ChiselBlocks.java | 2 ++ .../chisel/block/BlockAutoChisel.java | 26 +++++++++++++++++++ .../chisel/block/BlockMarbleIce.java | 8 +----- .../chisel/carving/CarvableHelper.java | 3 --- .../minecraft/chisel/carving/Carving.java | 3 ++- 7 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java diff --git a/build.gradle b/build.gradle index afaa9a98..7df2276b 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.5.4b" +version = "1.5.4d" group= "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Chisel" diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 958ab1fc..ea49b3a9 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -37,12 +37,11 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; -@Mod(modid = "chisel", name = "Chisel", version = "1.5.4c") +@Mod(modid = "chisel", name = "Chisel", version = "1.5.4d") public class Chisel { public static ItemChisel chisel; - // public static ItemChisel needle; - public static Item itemIceshard; + // public static ItemChisel needle; public static ItemCloudInABottle itemCloudInABottle; public static ItemBallOMoss itemBallOMoss; public static ItemSmashingRock smashingRock; @@ -56,6 +55,7 @@ public class Chisel public static int particlesTickrate; public static boolean blockDescriptions; public static boolean ghostCloud; + public static boolean iceMelt; 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); @@ -145,6 +145,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); ChiselBlocks.load(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index 982aeb21..ee7b1a92 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -568,6 +568,7 @@ public class ChiselBlocks if(Chisel.featureEnabled("netherBrick")) { blockNetherBrick = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("netherBrick", Blocks.nether_brick, 0, 0); //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"); @@ -1033,6 +1034,7 @@ public class ChiselBlocks { blockDirt = (BlockCarvable) new BlockCarvable(Material.ground).setHardness(0.5F).setStepSound(Block.soundTypeGravel).setBlockName("dirt.default"); blockDirt.carverHelper.setBlockName("Dirt"); + Carving.chisel.addVariation("dirt", Blocks.dirt, 0, 0); //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"); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java new file mode 100644 index 00000000..bec21b10 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java @@ -0,0 +1,26 @@ +package info.jbcs.minecraft.chisel.block; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +/** + * Created by Pokefenn. + * Licensed under MIT (If this is one of my Mods) + */ +public class BlockAutoChisel extends BlockContainer +{ + public BlockAutoChisel() + { + super(Material.rock); + setBlockName("autoChisel"); + setHardness(1F); + } + + @Override + public TileEntity createNewTileEntity(World var1, int var2) + { + return null; + } +} 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 fccef061..00b2b47a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java @@ -27,9 +27,7 @@ public class BlockMarbleIce extends BlockIce implements ICarvable public BlockMarbleIce() { super(); - carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); } @@ -61,15 +59,11 @@ public class BlockMarbleIce extends BlockIce implements ICarvable public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { super.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6); - return; - /* par2EntityPlayer.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1); par2EntityPlayer.addExhaustion(0.025F); - if(par1World.isRemote) - return; - +/* if(this.canSilkHarvest(par1World, par2EntityPlayer, par3, par4, par5, par6) && EnchantmentHelper.getSilkTouchModifier(par2EntityPlayer)) { ItemStack itemstack = this.createStackedBlock(par6); diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index 668488f4..9790db14 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -152,9 +152,6 @@ public class CarvableHelper if(variation == null) return null; -// if(variation.kind!=CTMX) -// return null; - return variation; } diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java index 7d71fa64..1a913907 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java @@ -174,7 +174,8 @@ public class Carving public String getVariationSound(Item item, int metadata) { CarvingGroup blockGroup = carvingGroupsByVariation.get(key(item, metadata)); - if(blockGroup == null || blockGroup.sound == null) return "chisel:chisel"; + if(blockGroup == null || blockGroup.sound == null) + return "chisel:chisel"; return blockGroup.sound; }