Skip to content

Commit

Permalink
Migrate to goooler shadowJar
Browse files Browse the repository at this point in the history
  • Loading branch information
dima-dencep committed Apr 23, 2024
1 parent 4a320fc commit ee0b778
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow" version "8.1.1" apply false
id "io.github.goooler.shadow" version "8.1.7" apply false
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
id "net.neoforged.licenser" version "0.7.2" apply false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

package com.github.dimadencep.mods.rrls.mixins.workaround;

import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.gl.VertexBuffer;
import net.minecraft.client.renderer.ShaderInstance;
import com.mojang.blaze3d.vertex.VertexBuffer;
import org.joml.Matrix4f;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -21,14 +21,14 @@
@Mixin(VertexBuffer.class)
public class VertexBufferMixin {
@Inject(
method = "drawInternal",
method = "_drawWithShader",
at = @At(
value = "HEAD"
),
cancellable = true
)
public void rrls$workaroundNullShader(Matrix4f viewMatrix, Matrix4f projectionMatrix, ShaderProgram program, CallbackInfo ci) {
if (program == null)
public void rrls$workaroundNullShader(Matrix4f viewMatrix, Matrix4f projectionMatrix, ShaderInstance shader, CallbackInfo ci) {
if (shader == null)
ci.cancel();
}
}
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "io.github.goooler.shadow"
}

architectury {
Expand Down
2 changes: 1 addition & 1 deletion forge/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "io.github.goooler.shadow"
}

architectury {
Expand Down

0 comments on commit ee0b778

Please sign in to comment.