diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java index 7365ee63..178a882b 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java @@ -19,6 +19,7 @@ import org.apache.commons.lang3.ArrayUtils; import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.client.CTM; +import com.cricketcraft.chisel.api.client.ISubmapManager; import com.cricketcraft.chisel.client.render.TextureSubmap; import com.cricketcraft.chisel.compat.fmp.FMPIMC; import com.cricketcraft.chisel.item.ItemCarvable; @@ -29,15 +30,6 @@ import cpw.mods.fml.common.registry.GameRegistry; public class CarvableHelper { - public interface ISubmapManager { - - IIcon getIcon(int side, int meta); - - IIcon getIcon(IBlockAccess world, int x, int y, int z, int side); - - void registerIcons(String modName, Block block, IIconRegister register); - } - public enum TextureType { TOPSIDE("top", "side"), diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java index 30e3d866..1a7eab7d 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.util.IIcon; -import com.cricketcraft.chisel.carving.CarvableHelper.ISubmapManager; +import com.cricketcraft.chisel.api.client.ISubmapManager; import com.cricketcraft.chisel.carving.CarvableHelper.TextureType; import com.cricketcraft.chisel.client.render.TextureSubmap; diff --git a/src/main/java/com/cricketcraft/chisel/carving/ITextureVariation.java b/src/main/java/com/cricketcraft/chisel/carving/ITextureVariation.java deleted file mode 100644 index 78a25fdb..00000000 --- a/src/main/java/com/cricketcraft/chisel/carving/ITextureVariation.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.cricketcraft.chisel.carving; - - -public interface ITextureVariation { - -} diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java index d0c485e4..122a2270 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java @@ -6,7 +6,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import com.cricketcraft.chisel.api.client.CTM; -import com.cricketcraft.chisel.carving.CarvableHelper.ISubmapManager; +import com.cricketcraft.chisel.api.client.ISubmapManager; import com.cricketcraft.chisel.init.ChiselBlocks; import static com.cricketcraft.chisel.api.client.Dir.*;