From 93cd9722b031997e57387832ecd5d4159418c9e6 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Tue, 17 Feb 2015 03:36:08 +0300 Subject: [PATCH] Added a default white texture; Fixed B3DLoader crashing when the brush has empty texture specified --- .../client/model/ModelLoader.java | 41 +++++++++++++++++++ .../client/model/b3d/B3DLoader.java | 2 + .../client/model/b3d/B3DModel.java | 3 +- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 3f51eae005..6364608eab 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -1,7 +1,9 @@ package net.minecraftforge.client.model; +import java.awt.image.BufferedImage; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -13,6 +15,7 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockModelShapes; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.ItemModelMesher; @@ -37,7 +40,10 @@ import net.minecraft.client.resources.model.WeightedBakedModel; import net.minecraft.item.Item; import net.minecraft.util.IRegistry; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameData; import net.minecraftforge.fml.common.registry.RegistryDelegate; @@ -71,6 +77,7 @@ public class ModelLoader extends ModelBakery super(manager, map, shapes); VanillaLoader.instance.setLoader(this); ModelLoaderRegistry.clearModelCache(); + MinecraftForge.EVENT_BUS.register(White.instance); } @Override @@ -450,6 +457,40 @@ public class ModelLoader extends ModelBakery } } + public static class White extends TextureAtlasSprite + { + public static ResourceLocation loc = new ResourceLocation("white"); + public static White instance = new White(); + + protected White() + { + super(loc.toString()); + } + + @Override + public boolean hasCustomLoader(IResourceManager manager, ResourceLocation location) + { + return true; + } + + @Override + public boolean load(IResourceManager manager, ResourceLocation location) + { + BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB); + image.setRGB(0, 0, 0xFFFFFFFF); + BufferedImage[] images = new BufferedImage[Minecraft.getMinecraft().gameSettings.mipmapLevels + 1]; + images[0] = image; + loadSprite(images, null); + return false; + } + + @SubscribeEvent + public void handleStitchPre(TextureStitchEvent.Pre event) + { + event.map.setTextureEntry(White.loc.toString(), White.instance); + } + } + public void onPostBakeEvent(IRegistry modelRegistry) { for(ModelResourceLocation missing : missingVariants) diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java index 0895dd7e13..ca0f3fbb07 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -33,6 +33,7 @@ import net.minecraftforge.client.model.IModelPart; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.b3d.B3DModel.Animation; @@ -455,6 +456,7 @@ public class B3DLoader implements ICustomModelLoader List textures = f.getBrush().getTextures(); TextureAtlasSprite sprite; if(textures.isEmpty()) sprite = this.textures.get("missingno"); + else if(textures.get(0) == B3DModel.Texture.White) sprite = ModelLoader.White.instance; else sprite = this.textures.get(textures.get(0).getPath()); putVertexData(f.getV1(), sprite); putVertexData(f.getV2(), sprite); diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java index d020223592..070e01f1a9 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java @@ -106,7 +106,7 @@ public class B3DModel logger.error(String.format("texture %s is out of range", texture)); return null; } - else if(texture == -1) return null; + else if(texture == -1) return Texture.White; return textures.get(texture); } @@ -482,6 +482,7 @@ public class B3DModel public static class Texture { + public static Texture White = new Texture("builtin/white", 0, 0, new Vector2f(0, 0), new Vector2f(1, 1), 0); private final String path; private final int flags; private final int blend;