Add fabric transitive access wideners as a dependency instead of doin…

…g our own
MineLittlePony · Jun 6, 2024 · bffd033 · bffd033
1 parent b6ae15f
commit bffd033
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,6 +44,7 @@ dependencies {
     modApi fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version)
     modApi fabricApi.module("fabric-key-binding-api-v1", project.fabric_version)
     modApi fabricApi.module("fabric-rendering-v1", project.fabric_version)
+    modApi fabricApi.module("fabric-transitive-access-wideners-v1", project.fabric_version)
 }
 
 processResources {

diff --git a/src/main/java/com/minelittlepony/common/util/render/RenderLayerUtil.java b/src/main/java/com/minelittlepony/common/util/render/RenderLayerUtil.java
@@ -2,31 +2,9 @@
 
 import java.util.Optional;
 import net.minecraft.client.render.*;
-import net.minecraft.client.render.VertexFormat.DrawMode;
 import net.minecraft.util.Identifier;
 
 public interface RenderLayerUtil {
-    static RenderLayer.MultiPhase layerOf(
-            Identifier name,
-            VertexFormat vertexFormat,
-            DrawMode drawMode,
-            int expectedBufferSize,
-            RenderLayer.MultiPhaseParameters phases) {
-        return RenderLayer.of(name.toString(), vertexFormat, drawMode, expectedBufferSize, phases);
-    }
-
-    static RenderLayer.MultiPhase layerOf(
-            Identifier name,
-            VertexFormat vertexFormat,
-            DrawMode drawMode,
-            int expectedBufferSize,
-            boolean crumbling,
-            boolean translucent,
-            RenderLayer.MultiPhaseParameters phases
-        ) {
-        return RenderLayer.of(name.toString(), vertexFormat, drawMode, expectedBufferSize, crumbling, translucent, phases);
-    }
-
     static Optional<Identifier> getTexture(RenderLayer layer) {
         if (layer instanceof RenderLayer.MultiPhase multiphase) {
             return multiphase.getPhases().texture.getId();

diff --git a/src/main/resources/kirin.aw b/src/main/resources/kirin.aw
@@ -4,9 +4,6 @@ extendable          method   net/minecraft/client/gui/tooltip/TooltipState
 accessible          field    net/minecraft/client/gui/widget/ClickableWidget        tooltip                  Lnet/minecraft/client/gui/tooltip/TooltipState;
 mutable             field    net/minecraft/client/gui/widget/ClickableWidget        tooltip                  Lnet/minecraft/client/gui/tooltip/TooltipState;
 
-accessible          method   net/minecraft/client/render/RenderLayer               of           (Ljava/lang/String;Lnet/minecraft/client/render/VertexFormat;Lnet/minecraft/client/render/VertexFormat$DrawMode;ILnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
-accessible          method   net/minecraft/client/render/RenderLayer               of           (Ljava/lang/String;Lnet/minecraft/client/render/VertexFormat;Lnet/minecraft/client/render/VertexFormat$DrawMode;IZZLnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
-
 accessible          class    net/minecraft/client/render/RenderPhase$TextureBase
 
 accessible          method   net/minecraft/client/render/RenderLayer$MultiPhase    getPhases    ()Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;