Change up how removing groups is done, should fix most issues

This commit is contained in:
tterrag1098 committed 2015-01-23 22:35:21 -05:00
1 parent 569cdee3b1
commit 48274f1e22
6 files changed
+72 -17

No files matched your search

@@ -2,8 +2,6 @@ package com.cricketcraft.chisel.api.carving;
import java.util.List;
import net.minecraft.block.Block;
/**
* Represents a group of chiselable blocks.
* <p>
@@ -59,7 +57,7 @@ public interface ICarvingGroup {
List<ICarvingVariation> getVariations();
/**
* Adds a variation to this group.
* Adds a variation to this group. Do not call this from external code, as it will fail to remove the inverse lookup from the registry.
*
* @param variation
* An {@link ICarvingVariation} to add to this group
@@ -67,13 +65,10 @@ public interface ICarvingGroup {
void addVariation(ICarvingVariation variation);
/**
* Removes a varaition with the passed {@link Block} and metadata from this group.
* Removes a variation to this group. Do not call this from external code, as it will fail to remove the inverse lookup from the registry.
*
* @param block
* The {@link Block} of the {@link ICarvingVariation variation}
* @param metadata
* The metadata of the {@link ICarvingVariation variation}
* @return The ICarvingVariation that was removed. Null if nothing was removed.
* @param variation
* An {@link ICarvingVariation} to add to this group
*/
ICarvingVariation removeVariation(Block block, int metadata);
boolean removeVariation(ICarvingVariation variation);
}
@@ -40,9 +40,33 @@ public interface ICarvingRegistry {
void addVariation(String groupName, ICarvingVariation variation);
void addGroup(ICarvingGroup group);
ICarvingGroup removeGroup(String groupName);
/**
* Removes a varaition with the passed {@link Block} and metadata from the registry. If this variation is registered with mutiple groups, it will remove it from all of them.
*
* @param block
* The {@link Block} of the {@link ICarvingVariation variation}
* @param metadata
* The metadata of the {@link ICarvingVariation variation}
* @return The ICarvingVariation that was removed. Null if nothing was removed.
*/
ICarvingVariation removeVariation(Block block, int metadata);
/**
* Removes a varaition with the passed {@link Block} and metadata from the registry, but only from the specified {@link ICarvingGroup} name.
*
* @param block
* The {@link Block} of the {@link ICarvingVariation variation}
* @param metadata
* The metadata of the {@link ICarvingVariation variation}
* @param group
* The name of the group that the variation should be removed from
* @return The ICarvingVariation that was removed. Null if nothing was removed.
*/
ICarvingVariation removeVariation(Block block, int metadata, String group);
void registerOre(String groupName, String oreName);
void setVariationSound(String name, String sound);