From ae4f5b739e464ba48f2fde336ffb02f74267144a Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Fri, 28 Dec 2018 23:00:26 +0100 Subject: [PATCH] compile fix --- .../fabric/impl/client/model/ModelLoadingRegistryImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java b/src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java index 287d05e6a..2bf84f206 100644 --- a/src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java +++ b/src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java @@ -17,7 +17,6 @@ package net.fabricmc.fabric.impl.client.model; import com.google.common.collect.Lists; -import com.sun.istack.internal.Nullable; import net.fabricmc.fabric.api.client.model.*; import net.fabricmc.loader.launch.common.FabricLauncherBase; import net.minecraft.client.render.model.ModelLoader; @@ -126,12 +125,12 @@ public class ModelLoadingRegistryImpl implements ModelLoadingRegistry { } } - @Nullable + /* @Nullable */ public UnbakedModel loadModelFromResource(Identifier resourceId) { return loadCustomModel((r) -> r.loadModelResource(resourceId, this), modelResourceProviders, "resource provider"); } - @Nullable + /* @Nullable */ public UnbakedModel loadModelFromVariant(Identifier variantId) { if (!(variantId instanceof ModelIdentifier)) { return loadModelFromResource(variantId);