mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Added a default white texture; Fixed B3DLoader crashing when the brush has empty texture specified
This commit is contained in:
1 parent
9e4ef54753
commit
93cd9722b0
3 files changed
+45
-1
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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<Texture> 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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user