Merge branch 'master' into feature/taskflow

Author: Avanatiker

common/src/main/java/com/lambda/mixin/render/SplashOverlayMixin.java

@@ -17,7 +17,12 @@
 
 package com.lambda.mixin.render;
 
+import com.lambda.util.LambdaResource;
 import net.minecraft.client.gui.screen.SplashOverlay;
+import net.minecraft.client.texture.ResourceTexture;
+import net.minecraft.resource.DefaultResourcePack;
+import net.minecraft.resource.InputSupplier;
+import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.ColorHelper;
 import org.spongepowered.asm.mixin.Final;
@@ -29,6 +34,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.io.InputStream;
 import java.util.function.IntSupplier;
 
 @Mixin(SplashOverlay.class)
@@ -47,4 +53,16 @@ private int redirectBrandArgb(IntSupplier originalSupplier) {
     private void onInit(CallbackInfo ci) {
         LOGO = Identifier.of("lambda", "textures/lambda_banner.png");
     }
+
+    @Mixin(SplashOverlay.LogoTexture.class)
+    static class LogoTextureMixin extends ResourceTexture {
+        @Redirect(method = "loadTextureData", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/DefaultResourcePack;open(Lnet/minecraft/resource/ResourceType;Lnet/minecraft/util/Identifier;)Lnet/minecraft/resource/InputSupplier;"))
+        InputSupplier<InputStream> loadTextureData(DefaultResourcePack instance, ResourceType type, Identifier id) {
+            return () -> new LambdaResource("textures/lambda_banner.png").getStream();
+        }
+
+        public LogoTextureMixin(Identifier location) {
+            super(location);
+        }
+    }
 }

common/src/main/resources/lambda.accesswidener

@@ -36,6 +36,7 @@ accessible method net/minecraft/client/render/Camera setRotation (FF)V
 accessible field com/mojang/blaze3d/systems/RenderSystem$ShapeIndexBuffer id I
 accessible field net/minecraft/client/render/BufferRenderer currentVertexBuffer Lnet/minecraft/client/gl/VertexBuffer;
 accessible field net/minecraft/client/texture/NativeImage pointer J
+accessible class net/minecraft/client/gui/screen/SplashOverlay$LogoTexture
 
 # Text
 accessible field net/minecraft/text/Style color Lnet/minecraft/text/TextColor;

common/src/main/resources/lambda.mixins.common.json

@@ -42,6 +42,7 @@
     "render.RenderTickCounterMixin",
     "render.ScreenHandlerMixin",
     "render.SplashOverlayMixin",
+    "render.SplashOverlayMixin$LogoTextureMixin",
     "render.VertexBufferMixin",
     "render.WorldRendererMixin",
     "world.BlockCollisionSpliteratorMixin",

gradle.properties

@@ -34,9 +34,9 @@ baritoneVersion=1.10.2
 discordIPCVersion=7ab2e77312
 
 # Fabric https://fabricmc.net/develop/
-fabricLoaderVersion=0.15.9
+fabricLoaderVersion=0.16.9
 yarnMappings=build.3
-fabricApiVersion=0.96.4
+fabricApiVersion=0.97.2
 kotlinFabricVersion=1.12.1+kotlin
 
 # Forge https://files.minecraftforge.net/