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

Puzzle 1.5.2 - Fix crash without ModMenu

Browse Source 
Fixes #67 & #68
This commit is contained in:
Motschen
2023-07-12 11:34:38 +02:00
parent 884ee8caf6
commit f91274dd90
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx4G
loader_version=0.14.21 loader_version=0.14.21
# Mod Properties # Mod Properties
mod_version = 1.5.1+1.20 mod_version = 1.5.2+1.20
maven_group = net.puzzlemc maven_group = net.puzzlemc
archives_base_name = puzzle archives_base_name = puzzle

4
puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java
View File

@@ -1,10 +1,10 @@
package net.puzzlemc.core.mixin; package net.puzzlemc.core.mixin;
import com.terraformersmc.modmenu.config.ModMenuConfig;
import eu.midnightdust.lib.util.PlatformFunctions; import eu.midnightdust.lib.util.PlatformFunctions;
import net.minecraft.client.gui.widget.PressableTextWidget; import net.minecraft.client.gui.widget.PressableTextWidget;
import net.puzzlemc.core.PuzzleCore; import net.puzzlemc.core.PuzzleCore;
import net.puzzlemc.core.config.PuzzleConfig; import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.core.util.ModMenuUtil;
import net.puzzlemc.core.util.UpdateChecker; import net.puzzlemc.core.util.UpdateChecker;
import net.minecraft.client.gui.screen.*; import net.minecraft.client.gui.screen.*;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@@ -26,7 +26,7 @@ public abstract class MixinTitleScreen extends Screen {
@Inject(at = @At("TAIL"), method = "init") @Inject(at = @At("TAIL"), method = "init")
private void puzzle$init(CallbackInfo ci) { private void puzzle$init(CallbackInfo ci) {
int yOffset = 8; int yOffset = 8;
if (PlatformFunctions.isModLoaded("modmenu") && ModMenuConfig.MODIFY_TITLE_SCREEN.getValue() && ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.CLASSIC) { if (PlatformFunctions.isModLoaded("modmenu") && ModMenuUtil.hasClassicButton()) {
yOffset += 12; yOffset += 12;
} }
Text puzzleText; Text puzzleText;

9
puzzle-base/src/main/java/net/puzzlemc/core/util/ModMenuUtil.java Normal file
View File

@@ -0,0 +1,9 @@
package net.puzzlemc.core.util;
import com.terraformersmc.modmenu.config.ModMenuConfig;
public class ModMenuUtil {
public static boolean hasClassicButton() {
return ModMenuConfig.MODIFY_TITLE_SCREEN.getValue() && ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.CLASSIC;
}
}