StateMc/BetterFoliage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix missing texture NPE

Browse Source
This commit is contained in:
octarine-noise
2014-08-12 19:03:37 +02:00
parent b365c1cf06
commit f2aeb870ce
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/mods/betterfoliage/client/BetterFoliageClient.java
View File

@@ -19,7 +19,6 @@ import mods.betterfoliage.client.resource.LeafTextureEnumerator;
import mods.betterfoliage.client.resource.ReedGenerator; import mods.betterfoliage.client.resource.ReedGenerator;
import mods.betterfoliage.client.resource.ShortGrassGenerator; import mods.betterfoliage.client.resource.ShortGrassGenerator;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@@ -34,17 +33,18 @@ import cpw.mods.fml.common.FMLCommonHandler;
public class BetterFoliageClient { public class BetterFoliageClient {
public static ResourceLocation missingTexture = new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png");
public static Map<Integer, IRenderBlockDecorator> decorators = Maps.newHashMap(); public static Map<Integer, IRenderBlockDecorator> decorators = Maps.newHashMap();
public static LeafGenerator leafGenerator; public static LeafGenerator leafGenerator = new LeafGenerator();
public static LeafParticleTextures leafParticles; public static LeafParticleTextures leafParticles = new LeafParticleTextures(0);
public static WindTracker wind = new WindTracker();
public static BlockMatcher leaves = new BlockMatcher(); public static BlockMatcher leaves = new BlockMatcher();
public static BlockMatcher crops = new BlockMatcher(); public static BlockMatcher crops = new BlockMatcher();
public static BlockMatcher dirt = new BlockMatcher(); public static BlockMatcher dirt = new BlockMatcher();
public static BlockMatcher grass = new BlockMatcher(); public static BlockMatcher grass = new BlockMatcher();
public static ResourceLocation missingTexture = new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png");
public static void preInit() { public static void preInit() {
FMLCommonHandler.instance().bus().register(new KeyHandler()); FMLCommonHandler.instance().bus().register(new KeyHandler());
@@ -56,6 +56,9 @@ public class BetterFoliageClient {
registerRenderer(new RenderBlockBetterReed()); registerRenderer(new RenderBlockBetterReed());
registerRenderer(new RenderBlockBetterAlgae()); registerRenderer(new RenderBlockBetterAlgae());
registerRenderer(new RenderBlockBetterCoral()); registerRenderer(new RenderBlockBetterCoral());
MinecraftForge.EVENT_BUS.register(wind);
FMLCommonHandler.instance().bus().register(wind);
leaves.load(new File(BetterFoliage.configDir, "classesLeaves.cfg"), new ResourceLocation("betterfoliage:classesLeavesDefault.cfg")); leaves.load(new File(BetterFoliage.configDir, "classesLeaves.cfg"), new ResourceLocation("betterfoliage:classesLeavesDefault.cfg"));
MinecraftForge.EVENT_BUS.register(leaves); MinecraftForge.EVENT_BUS.register(leaves);
@@ -70,9 +73,7 @@ public class BetterFoliageClient {
MinecraftForge.EVENT_BUS.register(grass); MinecraftForge.EVENT_BUS.register(grass);
BetterFoliage.log.info("Registering texture generators"); BetterFoliage.log.info("Registering texture generators");
leafGenerator = new LeafGenerator();
MinecraftForge.EVENT_BUS.register(leafGenerator); MinecraftForge.EVENT_BUS.register(leafGenerator);
leafParticles = new LeafParticleTextures(0);
MinecraftForge.EVENT_BUS.register(leafParticles); MinecraftForge.EVENT_BUS.register(leafParticles);
MinecraftForge.EVENT_BUS.register(new LeafTextureEnumerator()); MinecraftForge.EVENT_BUS.register(new LeafTextureEnumerator());