Add variation removal support to API, add ICarvingRegistry

This commit is contained in:
tterrag1098 committed 2015-01-22 21:33:43 -05:00
1 parent 760c0c8864
commit bfabad129f
10 files changed
+85 -12

No files matched your search

@@ -12,9 +12,10 @@ import net.minecraftforge.oredict.OreDictionary;
import com.cricketcraft.chisel.Chisel;
import com.cricketcraft.chisel.api.carving.ICarvingGroup;
import com.cricketcraft.chisel.api.carving.ICarvingRegistry;
import com.cricketcraft.chisel.api.carving.ICarvingVariation;
public class Carving {
public class Carving implements ICarvingRegistry {
GroupList groups = new GroupList();
@@ -24,6 +25,7 @@ public class Carving {
private Carving() {
}
@Override
public ICarvingVariation getVariation(Block block, int metadata) {
ICarvingGroup g = getGroup(block, metadata);
if (g != null) {
@@ -36,7 +38,8 @@ public class Carving {
return null;
}
public List<ICarvingVariation> getVariations(Block block, int metadata) {
@Override
public List<ICarvingVariation> getGroupVariations(Block block, int metadata) {
ICarvingGroup group = getGroup(block, metadata);
if (group == null)
return null;
@@ -44,7 +47,8 @@ public class Carving {
return group.getVariations();
}
public String getOre(Block block, int metadata) {
@Override
public String getOreName(Block block, int metadata) {
ICarvingGroup group = getGroup(block, metadata);
if (group == null)
return null;
@@ -52,7 +56,8 @@ public class Carving {
return group.getOreName();
}
public ArrayList<ItemStack> getItems(ItemStack chiseledItem) {
@Override
public List<ItemStack> getItemsForChiseling(ItemStack chiseledItem) {
ArrayList<ItemStack> items = new ArrayList<ItemStack>();
int damage = chiseledItem.getItemDamage();
@@ -94,6 +99,7 @@ public class Carving {
return items;
}
@Override
public ICarvingGroup getGroup(Block block, int metadata) {
int[] ids = OreDictionary.getOreIDs(new ItemStack(block, metadata));
if (ids.length > 0) {
@@ -108,10 +114,12 @@ public class Carving {
return groups.getGroup(block, metadata);
}
@Override
public ICarvingGroup getGroup(String name) {
return groups.getGroupByName(name);
}
@Override
public void addVariation(String groupName, Block block, int metadata, int order) {
if (block == null) {
throw new NullPointerException("Cannot add variation in group " + groupName + " for null block.");
@@ -121,6 +129,7 @@ public class Carving {
addVariation(groupName, variation);
}
@Override
public void addVariation(String groupName, ICarvingVariation variation) {
if (groupName == null) {
throw new NullPointerException("Cannot add variation to null group name.");
@@ -138,10 +147,12 @@ public class Carving {
groups.addVariation(groupName, variation);
}
@Override
public void addGroup(ICarvingGroup group) {
groups.add(group);
}
@Override
public void registerOre(String name, String oreName) {
ICarvingGroup group = groups.getGroupByName(name);
if (group != null) {
@@ -151,6 +162,7 @@ public class Carving {
}
}
@Override
public void setVariationSound(String name, String sound) {
ICarvingGroup group = groups.getGroupByName(name);
if (group != null) {
@@ -160,16 +172,19 @@ public class Carving {
}
}
@Override
public String getVariationSound(Block block, int metadata) {
return getVariationSound(Item.getItemFromBlock(block), metadata);
}
@Override
public String getVariationSound(Item item, int metadata) {
ICarvingGroup group = groups.getGroup(Block.getBlockFromItem(item), metadata);
String sound = group == null ? null : group.getSound();
return sound == null ? Chisel.MOD_ID + ":chisel.fallback" : sound;
}
@Override
public List<String> getSortedGroupNames() {
List<String> names = new ArrayList<String>();
names.addAll(groups.getNames());