Major refactoring

Added cactus and lilypads
This commit is contained in:
octarine-noise
2014-06-29 21:53:35 +02:00
parent ec184f9916
commit 220f2356d8
26 changed files with 773 additions and 303 deletions

View File

@@ -1,43 +1,43 @@
package mods.betterfoliage.client;
import java.io.File;
import java.util.Map;
import java.util.Set;
import mods.betterfoliage.BetterFoliage;
import mods.betterfoliage.BlockRenderTypeOverride;
import mods.betterfoliage.BlockRenderTypeOverride.IRenderTypeProvider;
import mods.betterfoliage.client.render.RenderBlockBetterGrass;
import mods.betterfoliage.client.render.RenderBlockBetterLeaves;
import mods.betterfoliage.client.render.IRenderBlockDecorator;
import mods.betterfoliage.client.render.impl.RenderBlockBetterCactus;
import mods.betterfoliage.client.render.impl.RenderBlockBetterGrass;
import mods.betterfoliage.client.render.impl.RenderBlockBetterLeaves;
import mods.betterfoliage.client.render.impl.RenderBlockBetterLilypad;
import mods.betterfoliage.client.resource.ILeafTextureRecognizer;
import mods.betterfoliage.client.resource.LeafTextureGenerator;
import mods.betterfoliage.common.config.Config;
import net.minecraft.block.Block;
import net.minecraft.block.BlockGrass;
import net.minecraft.block.BlockLeavesBase;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.MinecraftForge;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class BetterFoliageClient implements IRenderTypeProvider, ILeafTextureRecognizer {
public class BetterFoliageClient implements ILeafTextureRecognizer {
public static int leavesRenderId;
public static int grassRenderId;
public static LeafTextureGenerator leafGenerator;
public static Map<Integer, IRenderBlockDecorator> decorators = Maps.newHashMap();
public static Set<Class<?>> blockLeavesClasses = Sets.newHashSet();
public static LeafTextureGenerator leafGenerator;
public static void preInit() {
FMLCommonHandler.instance().bus().register(new KeyHandler());
BetterFoliage.log.info("Registering renderers");
leavesRenderId = RenderBlockBetterLeaves.register();
grassRenderId = RenderBlockBetterGrass.register();
BlockRenderTypeOverride.provider = new BetterFoliageClient();
registerRenderer(new RenderBlockBetterLeaves());
registerRenderer(new RenderBlockBetterGrass());
registerRenderer(new RenderBlockBetterCactus());
registerRenderer(new RenderBlockBetterLilypad());
blockLeavesClasses.add(BlockLeavesBase.class);
addLeafBlockClass("forestry.arboriculture.gadgets.BlockLeaves");
@@ -49,31 +49,36 @@ public class BetterFoliageClient implements IRenderTypeProvider, ILeafTextureRec
leafGenerator.recognizers.add(new BetterFoliageClient());
leafGenerator.loadLeafMappings(new File(BetterFoliage.configDir, "leafMask.properties"));
}
protected static void addLeafBlockClass(String className) {
try {
blockLeavesClasses.add(Class.forName(className));
} catch(ClassNotFoundException e) {
}
}
public int getRenderType(int original, Block block) {
// universal sign for DON'T RENDER ME!
if (original == -1) return original;
if (Config.grassEnabled && block instanceof BlockGrass) return grassRenderId;
if (Config.leavesEnabled)
for (Class<?> clazz : blockLeavesClasses)
if (clazz.isAssignableFrom(block.getClass()) && (original == 0 || original >= 42))
return leavesRenderId;
return original;
}
public boolean isLeafTexture(TextureAtlasSprite icon) {
String resourceLocation = icon.getIconName();
if (resourceLocation.startsWith("forestry:leaves/")) return true;
return false;
}
public static int getRenderTypeOverride(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
// universal sign for DON'T RENDER ME!
if (original == -1) return original;
for (Map.Entry<Integer, IRenderBlockDecorator> entry : decorators.entrySet())
if (entry.getValue().isBlockAccepted(blockAccess, x, y, z, block, original))
return entry.getKey();
return original;
}
public static void registerRenderer(IRenderBlockDecorator decorator) {
int renderId = RenderingRegistry.getNextAvailableRenderId();
decorators.put(renderId, decorator);
RenderingRegistry.registerBlockHandler(renderId, decorator);
MinecraftForge.EVENT_BUS.register(decorator);
decorator.init();
}
protected static void addLeafBlockClass(String className) {
try {
blockLeavesClasses.add(Class.forName(className));
} catch(ClassNotFoundException e) {
}
}
}