From ed90f90c0c034603d11488153035cb0e15e93e57 Mon Sep 17 00:00:00 2001 From: Fenn Date: Thu, 24 Apr 2014 10:17:21 +0100 Subject: [PATCH] Lavastone now emits light, fixed bug on Slabs Slabs can't be placed in the top of a block, yet. I'm going to rewrite it in the future. --- src/main/java/info/jbcs/minecraft/chisel/Chisel.java | 2 +- .../java/info/jbcs/minecraft/chisel/StepSoundEx.java | 11 ----------- .../jbcs/minecraft/chisel/block/BlockLavastone.java | 1 + .../jbcs/minecraft/chisel/block/BlockMarbleSlab.java | 3 ++- .../jbcs/minecraft/chisel/item/ItemMarbleSlab.java | 4 +++- src/main/resources/mcmod.info | 4 ++-- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 7d97f52b..bce1f890 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -37,7 +37,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; -@Mod(modid = "chisel", name = "Chisel", version = "1.5.4") +@Mod(modid = "chisel", name = "Chisel", version = "1.5.4a") public class Chisel { public static ItemChisel chisel; diff --git a/src/main/java/info/jbcs/minecraft/chisel/StepSoundEx.java b/src/main/java/info/jbcs/minecraft/chisel/StepSoundEx.java index 71294592..ce6d4065 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/StepSoundEx.java +++ b/src/main/java/info/jbcs/minecraft/chisel/StepSoundEx.java @@ -20,15 +20,4 @@ public class StepSoundEx extends SoundType { return this.soundName; } -/* - @Override - public String getStepSound() { - return stepName; - } - - @Override - public String getPlaceSound() { - return placeName; - } -*/ } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java index 2e68e39e..ea7164d2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java @@ -13,6 +13,7 @@ public class BlockLavastone extends BlockMarbleTexturedOre public BlockLavastone(Material mat, String baseIcon) { super(mat, baseIcon); + setLightLevel(1F); } @Override 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 1d527887..e111b94d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java @@ -116,7 +116,8 @@ public class BlockMarbleSlab extends BlockCarvable @Override public void getSubBlocks(Item block, CreativeTabs tabs, List list) { - if(isBottom) super.getSubBlocks(block, tabs, list); + if(isBottom) + super.getSubBlocks(block, tabs, list); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java index f6d9effc..4097b4a3 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java @@ -109,7 +109,9 @@ public class ItemMarbleSlab extends ItemCarvable if(side != 0 && (side == 1 || hy <= 0.5D)) return true; - world.setBlock(x, y, z, block.top, meta, 2); + + //TODO allow top slabs + //world.setBlock(x, y, z, block.top, meta, 2); return true; } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index f6c4d7cc..dd6131b8 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,13 +3,13 @@ "modid": "chisel", "name": "Chisel", "description": "A mod that adds in many fancy blocks for decoration, which are crafted utilising the Chisel.", - "version": "1.5.4", + "version": "1.5.4a", "credits": "This mod uses a lot of textures from the Painterly pack: http://painterlypack.net/. Also one stone variation is designed to look like a block from Doku.", "logoFile": "", "mcversion": "1.7.2", "url": "", "updateUrl": "", - "authors": [ "AUTOMATIC_MAIDEN" "asiekierka" "Pokefenn" ], + "authors": [ "AUTOMATIC_MAIDEN", "asiekierka", "Pokefenn" ], "parent":"", "screenshots": [], "dependencies": []