diff --git a/src/main/java/mods/betterfoliage/client/BetterFoliageClient.java b/src/main/java/mods/betterfoliage/client/BetterFoliageClient.java index 7d94953..366259f 100644 --- a/src/main/java/mods/betterfoliage/client/BetterFoliageClient.java +++ b/src/main/java/mods/betterfoliage/client/BetterFoliageClient.java @@ -14,7 +14,6 @@ import mods.betterfoliage.client.render.impl.RenderBlockBetterLilypad; import mods.betterfoliage.client.render.impl.RenderBlockBetterReed; import mods.betterfoliage.client.resource.BlockTextureGenerator; import mods.betterfoliage.client.resource.HalfTextureResource; -import mods.betterfoliage.client.resource.ILeafTextureRecognizer; import mods.betterfoliage.client.resource.LeafTextureGenerator; import net.minecraft.block.Block; import net.minecraft.block.BlockCarrot; @@ -36,7 +35,7 @@ import com.google.common.collect.Maps; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; -public class BetterFoliageClient implements ILeafTextureRecognizer { +public class BetterFoliageClient { public static Map decorators = Maps.newHashMap(); public static LeafTextureGenerator leafGenerator; @@ -74,7 +73,6 @@ public class BetterFoliageClient implements ILeafTextureRecognizer { BetterFoliage.log.info("Registering leaf texture generator"); leafGenerator = new LeafTextureGenerator(); MinecraftForge.EVENT_BUS.register(leafGenerator); - leafGenerator.recognizers.add(new BetterFoliageClient()); MinecraftForge.EVENT_BUS.register(new BlockTextureGenerator("bf_reed_bottom", new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png")) { @Override @@ -92,7 +90,7 @@ public class BetterFoliageClient implements ILeafTextureRecognizer { MinecraftForge.EVENT_BUS.register(new BetterFoliageClient()); } - public boolean isLeafTexture(TextureAtlasSprite icon) { + public static boolean isLeafTexture(TextureAtlasSprite icon) { String resourceLocation = icon.getIconName(); if (resourceLocation.startsWith("forestry:leaves/")) return true; return false; diff --git a/src/main/java/mods/betterfoliage/client/resource/ILeafTextureRecognizer.java b/src/main/java/mods/betterfoliage/client/resource/ILeafTextureRecognizer.java deleted file mode 100644 index cb347d8..0000000 --- a/src/main/java/mods/betterfoliage/client/resource/ILeafTextureRecognizer.java +++ /dev/null @@ -1,11 +0,0 @@ -package mods.betterfoliage.client.resource; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; - -@SideOnly(Side.CLIENT) -public interface ILeafTextureRecognizer { - - public boolean isLeafTexture(TextureAtlasSprite icon); -} diff --git a/src/main/java/mods/betterfoliage/client/resource/LeafTextureGenerator.java b/src/main/java/mods/betterfoliage/client/resource/LeafTextureGenerator.java index 6d340a5..3a34892 100644 --- a/src/main/java/mods/betterfoliage/client/resource/LeafTextureGenerator.java +++ b/src/main/java/mods/betterfoliage/client/resource/LeafTextureGenerator.java @@ -2,7 +2,6 @@ package mods.betterfoliage.client.resource; import java.io.IOException; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; @@ -20,7 +19,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.TextureStitchEvent.Post; import net.minecraftforge.client.event.TextureStitchEvent.Pre; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import cpw.mods.fml.relauncher.Side; @@ -40,9 +38,6 @@ public class LeafTextureGenerator extends BlockTextureGenerator implements IIcon super("bf_leaves_autogen", new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png")); } - /** List of helpers which can identify leaf textures loaded by alternate means */ - public List recognizers = Lists.newLinkedList(); - public IResource getResource(ResourceLocation resourceLocation) throws IOException { ResourceLocation original = unwrapResource(resourceLocation);