diff --git a/Puzzle_Splashscreen_Template.zip b/Puzzle_Splashscreen_Template.zip new file mode 100644 index 0000000..467321e Binary files /dev/null and b/Puzzle_Splashscreen_Template.zip differ diff --git a/common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java b/common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java index 043ec8b..8504f3b 100755 --- a/common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java +++ b/common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java @@ -81,6 +81,7 @@ public class PuzzleSplashScreen { PuzzleConfig.hasCustomSplashScreen = true; } if (properties.get("screen.loading.blend") != null) { + // Recommended blend: SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE ZERO PuzzleConfig.disableBlend = properties.get("screen.loading.blend").toString().equals("off"); PuzzleConfig.customBlendFunction = new ArrayList<>(Arrays.stream(properties.get("screen.loading.blend").toString().split(" ")).toList()); PuzzleConfig.hasCustomSplashScreen = true; diff --git a/common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java b/common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java index c0b9ca3..b4fdba6 100755 --- a/common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java +++ b/common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java @@ -62,7 +62,7 @@ public abstract class MixinSplashScreen extends Overlay { @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;blendFunc(II)V", shift = At.Shift.AFTER), remap = false) private void puzzle$betterBlend(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { if (PuzzleConfig.resourcepackSplashScreen) { - if (PuzzleConfig.disableBlend) RenderSystem.defaultBlendFunc(); + if (PuzzleConfig.disableBlend) RenderSystem.disableBlend(); else if (PuzzleConfig.customBlendFunction.size() == 4) RenderSystem.blendFuncSeparate( GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)), GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)), diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c1fff6b..90303f9 100755 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -4,7 +4,7 @@ "version": "${version}", "name": "Puzzle", - "description": "Improved resourcepack capabilities.", + "description": "Unites optifine replacement mods in a clean & vanilla-style gui", "authors": [ "PuzzleMC", "Motschen" diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 7c5884e..160dc32 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -10,7 +10,7 @@ displayName = "Puzzle" logoFile = "puzzle.png" authors = "PuzzleMC, Motschen" description = ''' -Improved resourcepack capabilities. +Unites optifine replacement mods in a clean & vanilla-style gui ''' [[mixins]] diff --git a/puzzle-splashscreen_example_pack.zip b/puzzle-splashscreen_example_pack.zip deleted file mode 100644 index d862f2f..0000000 Binary files a/puzzle-splashscreen_example_pack.zip and /dev/null differ