Chisel 1.5.1 - add new textures, etc

This commit is contained in:
asiekierka committed 2014-03-17 16:36:29 +01:00
1 parent c79c767bb8
commit 1efc4a0ad4
152 files changed
+316 -467

No files matched your search

@@ -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));
}
}