From 9b277bd897490d13ee4549a086e8d1b5f4cd0e10 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Sun, 4 Aug 2024 21:10:08 +0200 Subject: Add SkyBlockIsland type [no changelog] --- .../moe/nea/firmament/mixins/CustomModelBakerPatch.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/main/java/moe/nea/firmament') diff --git a/src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java b/src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java index baffa4c..2efcf76 100644 --- a/src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java +++ b/src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java @@ -8,13 +8,9 @@ package moe.nea.firmament.mixins; import moe.nea.firmament.events.BakeExtraModelsEvent; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; -import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.ModelIdentifier; -import net.minecraft.client.util.SpriteIdentifier; -import net.minecraft.resource.Resource; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -24,20 +20,19 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.Map; -import java.util.function.BiFunction; @Mixin(ModelLoader.class) public abstract class CustomModelBakerPatch { @Shadow - protected abstract void loadItemModel(ModelIdentifier id); + @Final + private Map modelsToBake; @Shadow - abstract UnbakedModel getOrLoadModel(Identifier id); + protected abstract void loadItemModel(ModelIdentifier id); @Shadow - @Final - private Map modelsToBake; + abstract UnbakedModel getOrLoadModel(Identifier id); @Inject(method = "bake", at = @At("HEAD")) public void onBake(ModelLoader.SpriteGetter spliteGetter, CallbackInfo ci) { -- cgit