From 4114fbdc820c27e1c771b0ee37444938cc0154a2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 14 Apr 2021 18:33:20 +0100 Subject: [PATCH] 21w15a - Just a singular mapping update. --- build.gradle | 6 +++--- fabric-models-v0/build.gradle | 2 +- .../fabric/mixin/client/model/MixinModelLoader.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 6c2f30eab..01f67ad89 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,8 @@ plugins { def ENV = System.getenv() class Globals { - static def baseVersion = "0.32.7" - static def mcVersion = "21w14a" + static def baseVersion = "0.32.8" + static def mcVersion = "21w15a" static def yarnVersion = "+build.1" static def loaderVersion = "0.10.5+build.213" static def preRelease = true @@ -37,7 +37,7 @@ def getSubprojectVersion(project, version) { if (grgit == null) { return version + "+nogit" } - + MixinModelLoader def latestCommits = grgit.log(paths: [project.name], maxCommits: 1) if (latestCommits.isEmpty()) { diff --git a/fabric-models-v0/build.gradle b/fabric-models-v0/build.gradle index 77f7d365b..1436700c5 100644 --- a/fabric-models-v0/build.gradle +++ b/fabric-models-v0/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-models-v0" -version = getSubprojectVersion(project, "0.2.1") +version = getSubprojectVersion(project, "0.2.2") moduleDependencies(project, [ 'fabric-api-base' diff --git a/fabric-models-v0/src/main/java/net/fabricmc/fabric/mixin/client/model/MixinModelLoader.java b/fabric-models-v0/src/main/java/net/fabricmc/fabric/mixin/client/model/MixinModelLoader.java index 3067efc38..aa382f8ed 100644 --- a/fabric-models-v0/src/main/java/net/fabricmc/fabric/mixin/client/model/MixinModelLoader.java +++ b/fabric-models-v0/src/main/java/net/fabricmc/fabric/mixin/client/model/MixinModelLoader.java @@ -39,7 +39,7 @@ import net.fabricmc.fabric.impl.client.model.ModelLoadingRegistryImpl; public abstract class MixinModelLoader implements ModelLoaderHooks { // this is the first one @Shadow - public static ModelIdentifier MISSING; + public static ModelIdentifier MISSING_ID; @Shadow private ResourceManager resourceManager; @Shadow @@ -75,7 +75,7 @@ public abstract class MixinModelLoader implements ModelLoaderHooks { @Inject(at = @At("HEAD"), method = "addModel") private void addModelHook(ModelIdentifier id, CallbackInfo info) { - if (id == MISSING) { + if (id == MISSING_ID) { //noinspection RedundantCast ModelLoaderHooks hooks = this;