infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

compile fix

Browse source
This commit is contained in:
Adrian Siekierka 2018-12-28 23:00:26 +01:00
parent fa7108e6e8
commit ae4f5b739e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/net/fabricmc/fabric/impl/client/model/ModelLoadingRegistryImpl.java
View file

@ -17,7 +17,6 @@
package net.fabricmc.fabric.impl.client.model; package net.fabricmc.fabric.impl.client.model;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.sun.istack.internal.Nullable;
import net.fabricmc.fabric.api.client.model.*; import net.fabricmc.fabric.api.client.model.*;
import net.fabricmc.loader.launch.common.FabricLauncherBase; import net.fabricmc.loader.launch.common.FabricLauncherBase;
import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.ModelLoader;
@ -126,12 +125,12 @@ public class ModelLoadingRegistryImpl implements ModelLoadingRegistry {
} }
} }
@Nullable /* @Nullable */
public UnbakedModel loadModelFromResource(Identifier resourceId) { public UnbakedModel loadModelFromResource(Identifier resourceId) {
return loadCustomModel((r) -> r.loadModelResource(resourceId, this), modelResourceProviders, "resource provider"); return loadCustomModel((r) -> r.loadModelResource(resourceId, this), modelResourceProviders, "resource provider");
} }
@Nullable /* @Nullable */
public UnbakedModel loadModelFromVariant(Identifier variantId) { public UnbakedModel loadModelFromVariant(Identifier variantId) {
if (!(variantId instanceof ModelIdentifier)) { if (!(variantId instanceof ModelIdentifier)) {
return loadModelFromResource(variantId); return loadModelFromResource(variantId);