From 4abc60cf8e59f5b56a3d57487c0ba9106d6d6cd7 Mon Sep 17 00:00:00 2001 From: elix-x Date: Thu, 18 Aug 2016 11:51:02 +0200 Subject: [PATCH] Fixed UVLLoader Fixed UVLLoader. Well, kinda. It's waiting for something else to be fully fixed. --- .../java/appeng/client/render/model/UVLModelLoader.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index e1b63a04..681c7886 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -154,9 +154,14 @@ public enum UVLModelLoader implements ICustomModelLoader @Override public boolean accepts( ResourceLocation modelLocation ) { - try + String modelPath = modelLocation.getResourcePath(); + if( modelLocation.getResourcePath().startsWith( "models/" ) ) { - return gson.fromJson( new InputStreamReader( Minecraft.getMinecraft().getResourceManager().getResource( modelLocation ).getInputStream() ), UVLMarker.class ).uvlMarker; + modelPath = modelPath.substring( "models/".length() ); + } + try( InputStreamReader io = new InputStreamReader( Minecraft.getMinecraft().getResourceManager().getResource( new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) ).getInputStream() ) ) + { + return gson.fromJson( io, UVLMarker.class ).uvlMarker; } catch( IOException e ) {