Motschen/Puzzle
1
0
Fork 0
mirror of https://github.com/PuzzleMC/Puzzle.git synced 2025-12-15 11:25:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Actually disable blending & Update example pack

Browse Source 
- Blending will now be disabled when set to "off" instead of using the default blend function
This commit is contained in:
Martin Prokoph
2024-09-07 12:33:28 +02:00
parent 9dbe28242a
commit fb1852dc2b
6 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Puzzle_Splashscreen_Template.zip Normal file
View File

Binary file not shown.

1
common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
View File

@@ -81,6 +81,7 @@ public class PuzzleSplashScreen {
PuzzleConfig.hasCustomSplashScreen = true; PuzzleConfig.hasCustomSplashScreen = true;
} }
if (properties.get("screen.loading.blend") != null) { 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.disableBlend = properties.get("screen.loading.blend").toString().equals("off");
PuzzleConfig.customBlendFunction = new ArrayList<>(Arrays.stream(properties.get("screen.loading.blend").toString().split(" ")).toList()); PuzzleConfig.customBlendFunction = new ArrayList<>(Arrays.stream(properties.get("screen.loading.blend").toString().split(" ")).toList());
PuzzleConfig.hasCustomSplashScreen = true; PuzzleConfig.hasCustomSplashScreen = true;

2
common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
View File

@@ -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) @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) { private void puzzle$betterBlend(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
if (PuzzleConfig.resourcepackSplashScreen) { if (PuzzleConfig.resourcepackSplashScreen) {
if (PuzzleConfig.disableBlend) RenderSystem.defaultBlendFunc(); if (PuzzleConfig.disableBlend) RenderSystem.disableBlend();
else if (PuzzleConfig.customBlendFunction.size() == 4) RenderSystem.blendFuncSeparate( else if (PuzzleConfig.customBlendFunction.size() == 4) RenderSystem.blendFuncSeparate(
GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)), GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)), GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),

2
fabric/src/main/resources/fabric.mod.json
View File

@@ -4,7 +4,7 @@
"version": "${version}", "version": "${version}",
"name": "Puzzle", "name": "Puzzle",
"description": "Improved resourcepack capabilities.", "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
"authors": [ "authors": [
"PuzzleMC", "PuzzleMC",
"Motschen" "Motschen"

2
neoforge/src/main/resources/META-INF/neoforge.mods.toml
View File

@@ -10,7 +10,7 @@ displayName = "Puzzle"
logoFile = "puzzle.png" logoFile = "puzzle.png"
authors = "PuzzleMC, Motschen" authors = "PuzzleMC, Motschen"
description = ''' description = '''
Improved resourcepack capabilities. Unites optifine replacement mods in a clean & vanilla-style gui
''' '''
[[mixins]] [[mixins]]

BIN
puzzle-splashscreen_example_pack.zip
View File

Binary file not shown.