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

Update to 1.21.3

Browse Source
This commit is contained in:
Martin Prokoph
2024-11-05 10:29:04 +01:00
parent 07af46da3c
commit 9ee7ab1b89
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
View File

@@ -37,7 +37,7 @@ public abstract class MixinOptionsScreen extends Screen {
} }
} }
@Inject(at = @At("TAIL"), method = "initTabNavigation") @Inject(at = @At("TAIL"), method = "refreshWidgetPositions")
public void puzzle$onResize(CallbackInfo ci) { public void puzzle$onResize(CallbackInfo ci) {
if (PuzzleConfig.enablePuzzleButton) this.puzzle$setButtonPos(); if (PuzzleConfig.enablePuzzleButton) this.puzzle$setButtonPos();
} }

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

@@ -11,6 +11,7 @@ import net.minecraft.client.texture.NativeImage;
import net.minecraft.client.texture.NativeImageBackedTexture; import net.minecraft.client.texture.NativeImageBackedTexture;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import net.minecraft.util.math.ColorHelper;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.puzzlemc.core.config.PuzzleConfig; import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.splashscreen.PuzzleSplashScreen; import net.puzzlemc.splashscreen.PuzzleSplashScreen;
@@ -31,7 +32,7 @@ import static net.puzzlemc.splashscreen.PuzzleSplashScreen.BACKGROUND;
@Mixin(value = SplashOverlay.class, priority = 2000) @Mixin(value = SplashOverlay.class, priority = 2000)
public abstract class MixinSplashScreen extends Overlay { public abstract class MixinSplashScreen extends Overlay {
@Shadow @Final static Identifier LOGO; @Shadow @Final public static Identifier LOGO;
@Shadow private long reloadCompleteTime; @Shadow private long reloadCompleteTime;
@Shadow @Final private MinecraftClient client; @Shadow @Final private MinecraftClient client;
@Shadow @Final private boolean reloading; @Shadow @Final private boolean reloading;
@@ -60,7 +61,7 @@ public abstract class MixinSplashScreen extends Overlay {
private int puzzle$modifyBackground(IntSupplier instance) { // Set the Progress Bar Frame Color to our configured value // private int puzzle$modifyBackground(IntSupplier instance) { // Set the Progress Bar Frame Color to our configured value //
return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24; return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24;
} }
@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 = "Lnet/minecraft/util/math/ColorHelper;getWhite(F)I", 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.disableBlend(); if (PuzzleConfig.disableBlend) RenderSystem.disableBlend();
@@ -92,9 +93,7 @@ public abstract class MixinSplashScreen extends Overlay {
RenderSystem.enableBlend(); RenderSystem.enableBlend();
RenderSystem.blendEquation(32774); RenderSystem.blendEquation(32774);
RenderSystem.defaultBlendFunc(); RenderSystem.defaultBlendFunc();
RenderSystem.setShader(GameRenderer::getPositionTexProgram); context.drawTexture(RenderLayer::getGuiTextured, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ColorHelper.fromFloats(s, 1.0f, 1.0f, 1.0f));
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
context.drawTexture(BACKGROUND, 0, 0, 1, 0, 0, width, height, width, height);
RenderSystem.defaultBlendFunc(); RenderSystem.defaultBlendFunc();
RenderSystem.disableBlend(); RenderSystem.disableBlend();
} }

18
gradle.properties
View File

@@ -1,13 +1,13 @@
# Done to increase the memory available to gradle. # Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
minecraft_version=1.21 minecraft_version=1.21.3
supported_versions=1.21.1 supported_versions=1.21.2
yarn_mappings=1.21+build.2 yarn_mappings=1.21.3+build.2
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
# Mod Properties # Mod Properties
mod_version = 2.0.1 mod_version = 2.0.2
maven_group = net.puzzlemc maven_group = net.puzzlemc
archives_base_name = puzzle archives_base_name = puzzle
release_type=release release_type=release
@@ -15,15 +15,15 @@ curseforge_id=563977
modrinth_id=3IuO68q1 modrinth_id=3IuO68q1
# Modloaders # Modloaders
fabric_loader_version=0.15.11 fabric_loader_version=0.16.9
fabric_api_version=0.100.1+1.21 fabric_api_version=0.107.0+1.21.3
neoforge_version=21.0.143 neoforge_version=21.3.11-beta
yarn_mappings_patch_neoforge_version = 1.21+build.4 yarn_mappings_patch_neoforge_version = 1.21+build.4
# Libraries # Libraries
midnightlib_version = 1.6.3 midnightlib_version = 1.6.4
modmenu_version = 11.0.2 modmenu_version = 12.0.0-beta.1
# Mod Integrations # Mod Integrations
cull_leaves_version = 3.0.2-fabric cull_leaves_version = 3.0.2-fabric