diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModel.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModel.java index 4b0d375f6..ba96c09c0 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModel.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModel.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.resources.ResourceLocation; /** * A helper class for loading and accessing JSON models not directly used by any blocks or items. @@ -19,10 +19,10 @@ public class PartialModel { static final List ALL = new ArrayList<>(); static boolean tooLate = false; - protected final ModelResourceLocation modelLocation; + protected final ResourceLocation modelLocation; protected BakedModel bakedModel; - public PartialModel(ModelResourceLocation modelLocation) { + public PartialModel(ResourceLocation modelLocation) { if (tooLate) { throw new RuntimeException("Attempted to create PartialModel with location '" + modelLocation + "' after start of initial resource reload!"); } @@ -34,7 +34,7 @@ public class PartialModel { } } - public ModelResourceLocation getLocation() { + public ResourceLocation getLocation() { return modelLocation; } diff --git a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java index f403b7c44..ec3ff4123 100644 --- a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java +++ b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java @@ -15,7 +15,7 @@ public final class PartialModelEventHandler { public static void onRegisterAdditional(ModelEvent.RegisterAdditional event) { for (PartialModel partial : PartialModel.ALL) { - event.register(partial.getLocation()); + event.register(ModelResourceLocation.standalone(partial.getLocation())); } PartialModel.tooLate = true; @@ -25,7 +25,7 @@ public final class PartialModelEventHandler { Map models = event.getModels(); for (PartialModel partial : PartialModel.ALL) { - partial.set(models.get(partial.getLocation())); + partial.set(models.get(ModelResourceLocation.standalone(partial.getLocation()))); } } }