From e280f72cfb15d2fb60893643e72cdc0e6ad2ffd5 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Sat, 3 Oct 2015 04:42:35 +0300 Subject: [PATCH] '#' is now added automatically to the beginning of the texture names in B3D models, and the remapping is expected via the blockstate JSON, since it's more reasonable than adding it to the file name in the modelling program or matching the resource location with the filename. --- .../java/net/minecraftforge/client/model/b3d/B3DLoader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 fa107a45e5..d66996dbd4 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -354,7 +354,9 @@ public class B3DLoader implements ICustomModelLoader for(Texture t : textures) { String path = t.getPath(); - builder.put(path, new ResourceLocation(getLocation(path))); + String location = getLocation(path); + if(!location.startsWith("#")) location = "#" + location; + builder.put(path, new ResourceLocation(location)); } return builder.build(); }