Fixed serverside breaking

LudoCrypt · Dec 29, 2022 · 3896a31 · 3896a31
1 parent c6477b9
commit 3896a31
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 13 deletions.
diff --git a/limlib_effects/gradle.properties b/limlib_effects/gradle.properties
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = false
 org.gradle.workers.max = 1
 
-version=7.2.1
+version=7.2.2
 maven_group=net.ludocrypt
 archives_base_name=limlib-effects
diff --git a/limlib_effects/src/main/java/net/ludocrypt/limlib/effects/mixin/GameRendererMixin.java b/limlib_effects/src/main/java/net/ludocrypt/limlib/effects/mixin/GameRendererMixin.java
@@ -28,7 +28,7 @@ public class GameRendererMixin {
 			PostEffect postEffect = optionalPostEffect.get();
 			if (postEffect.shouldRender() && postEffect.getShaderLocation() != null && postEffect.getMemoizedShaderEffect().get() != null) {
 				postEffect.beforeRender();
-				postEffect.getMemoizedShaderEffect().get().render(tickDelta);
+				postEffect.getMemoizedShaderEffect().get().getShader().render(tickDelta);
 			}
 		}
 	}

diff --git a/limlib_effects/src/main/java/net/ludocrypt/limlib/effects/render/post/EmptyPostEffect.java b/limlib_effects/src/main/java/net/ludocrypt/limlib/effects/render/post/EmptyPostEffect.java
@@ -4,7 +4,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-import ladysnake.satin.api.managed.ManagedShaderEffect;
+import net.ludocrypt.limlib.effects.render.post.holder.ShaderHolder;
 
 public class EmptyPostEffect extends StaticPostEffect {
 
@@ -25,7 +25,7 @@ public boolean shouldRender() {
 	}
 
 	@Override
-	public Supplier<ManagedShaderEffect> getMemoizedShaderEffect() {
+	public Supplier<ShaderHolder> getMemoizedShaderEffect() {
 		return () -> null;
 	}
 

diff --git a/limlib_effects/src/main/java/net/ludocrypt/limlib/effects/render/post/PostEffect.java b/limlib_effects/src/main/java/net/ludocrypt/limlib/effects/render/post/PostEffect.java
@@ -5,13 +5,13 @@
 import com.google.common.base.Supplier;
 import com.mojang.serialization.Codec;
 
-import ladysnake.satin.api.managed.ManagedShaderEffect;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
 import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
 import net.ludocrypt.limlib.effects.mixin.BuiltinRegistriesAccessor;
 import net.ludocrypt.limlib.effects.mixin.RegistryAccessor;
+import net.ludocrypt.limlib.effects.render.post.holder.ShaderHolder;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
@@ -36,5 +36,5 @@ public abstract class PostEffect {
 	public abstract Identifier getShaderLocation();
 
 	@Environment(EnvType.CLIENT)
-	public abstract Supplier<ManagedShaderEffect> getMemoizedShaderEffect();
+	public abstract Supplier<ShaderHolder> getMemoizedShaderEffect();
 }
diff --git a/limlib_effects/src/main/java/net/ludocrypt/limlib/effects/render/post/StaticPostEffect.java b/limlib_effects/src/main/java/net/ludocrypt/limlib/effects/render/post/StaticPostEffect.java
@@ -5,10 +5,9 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-import ladysnake.satin.api.managed.ManagedShaderEffect;
-import ladysnake.satin.api.managed.ShaderEffectManager;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.ludocrypt.limlib.effects.render.post.holder.ShaderHolder;
 import net.minecraft.util.Identifier;
 
 public class StaticPostEffect extends PostEffect {
@@ -22,7 +21,7 @@ public class StaticPostEffect extends PostEffect {
 	private final Identifier shaderName;
 
 	@Environment(EnvType.CLIENT)
-	private final Supplier<ManagedShaderEffect> memoizedShaderEffect = Suppliers.memoize(() -> ShaderEffectManager.getInstance().manage(this.getShaderLocation()));
+	private final Supplier<ShaderHolder> memoizedShaderEffect = Suppliers.memoize(() -> new ShaderHolder(this.getShaderLocation()));
 
 	public StaticPostEffect(Identifier shaderLocation) {
 		this.shaderName = shaderLocation;
@@ -50,7 +49,7 @@ public Identifier getShaderLocation() {
 
 	@Override
 	@Environment(EnvType.CLIENT)
-	public Supplier<ManagedShaderEffect> getMemoizedShaderEffect() {
+	public Supplier<ShaderHolder> getMemoizedShaderEffect() {
 		return memoizedShaderEffect;
 	}
 

diff --git a/...b_effects/src/main/java/net/ludocrypt/limlib/effects/render/post/holder/ShaderHolder.java b/...b_effects/src/main/java/net/ludocrypt/limlib/effects/render/post/holder/ShaderHolder.java
@@ -0,0 +1,24 @@
+package net.ludocrypt.limlib.effects.render.post.holder;
+
+import ladysnake.satin.api.managed.ManagedShaderEffect;
+import ladysnake.satin.api.managed.ShaderEffectManager;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.util.Identifier;
+
+public class ShaderHolder {
+
+	@Environment(EnvType.CLIENT)
+	private final ManagedShaderEffect shaderEffect;
+
+	@Environment(EnvType.CLIENT)
+	public ShaderHolder(Identifier id) {
+		shaderEffect = ShaderEffectManager.getInstance().manage(id);
+	}
+
+	@Environment(EnvType.CLIENT)
+	public ManagedShaderEffect getShader() {
+		return shaderEffect;
+	}
+
+}
diff --git a/limlib_registry/gradle.properties b/limlib_registry/gradle.properties
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = false
 org.gradle.workers.max = 1
 
-version=7.2.1
+version=7.2.2
 maven_group=net.ludocrypt
 archives_base_name=limlib-registry
diff --git a/limlib_render/gradle.properties b/limlib_render/gradle.properties
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = false
 org.gradle.workers.max = 1
 
-version=7.2.1
+version=7.2.2
 maven_group=net.ludocrypt
 archives_base_name=limlib-render
diff --git a/limlib_world/gradle.properties b/limlib_world/gradle.properties
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = false
 org.gradle.workers.max = 1
 
-version=7.2.1
+version=7.2.2
 maven_group=net.ludocrypt
 archives_base_name=limlib-world