Skip to content

Commit 28316fa

Browse files
committedJan 18, 2023
[shaders] disable shader identifier fixin when satin is present (fixes #82)
1 parent 1a5db09 commit 28316fa

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed
 

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ minecraft_version=1.19.3
77
yarn_mappings=1.19.3+build.2
88
loader_version=0.14.11
99
# Mod Properties
10-
mod_version=0.10.0
10+
mod_version=0.10.1
1111
maven_group=io.wispforest
1212
archives_base_name=owo-lib
1313
# Dependencies

‎src/main/java/io/wispforest/owo/client/OwoClient.java

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.fabricmc.api.EnvType;
1313
import net.fabricmc.api.Environment;
1414
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
15+
import net.fabricmc.loader.api.FabricLoader;
1516
import net.minecraft.client.render.VertexFormats;
1617
import net.minecraft.util.Identifier;
1718
import net.minecraft.util.Util;
@@ -44,6 +45,9 @@ public class OwoClient implements ClientModInitializer {
4445
public static final GlProgram HSV_PROGRAM = new GlProgram(new Identifier("owo", "spectrum"), VertexFormats.POSITION_COLOR);
4546
public static final BlurProgram BLUR_PROGRAM = new BlurProgram();
4647

48+
@ApiStatus.Internal
49+
public static final boolean SATIN_LOADED = FabricLoader.getInstance().isModLoaded("satin");
50+
4751
@Override
4852
public void onInitializeClient() {
4953
ModDataLoader.load(OwoItemGroupLoader.INSTANCE);

‎src/main/java/io/wispforest/owo/mixin/shader/ShaderProgramMixin.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.wispforest.owo.mixin.shader;
22

3+
import io.wispforest.owo.client.OwoClient;
34
import net.minecraft.client.gl.ShaderProgram;
45
import org.spongepowered.asm.mixin.Mixin;
56
import org.spongepowered.asm.mixin.injection.At;
@@ -10,6 +11,8 @@ public class ShaderProgramMixin {
1011

1112
@ModifyArg(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Identifier;<init>(Ljava/lang/String;)V"))
1213
private String fixIdentifier(String id) {
14+
if (OwoClient.SATIN_LOADED) return id;
15+
1316
var splitName = id.split(":");
1417
if (splitName.length != 2) return id;
1518

@@ -18,6 +21,8 @@ private String fixIdentifier(String id) {
1821

1922
@ModifyArg(method = "loadShader", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Identifier;<init>(Ljava/lang/String;)V"))
2023
private static String fixMoreIdentifiers(String id) {
24+
if (OwoClient.SATIN_LOADED) return id;
25+
2126
var splitName = id.split(":");
2227
if (splitName.length != 2) return id;
2328

0 commit comments

Comments
 (0)