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

Puzzle 1.5.1 - 1.20 & Fixes

Browse Source 
- Update to 1.20
- Fix version string behaving weirdly with ModMenu installed
- Integration for CEM replaced with EMF
This commit is contained in:
Motschen
2023-06-10 18:55:29 +02:00
parent c921f3ff99
commit 884ee8caf6
17 changed files with 88 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java
View File

@@ -4,7 +4,6 @@ import com.mojang.blaze3d.platform.GlDebugInfo;
import net.puzzlemc.core.PuzzleCore;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.core.util.UpdateChecker;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.hud.DebugHud;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@@ -14,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.List;
@Mixin(DebugHud.class)
public abstract class MixinDebugHud extends DrawableHelper {
public abstract class MixinDebugHud {
@Inject(at = @At("RETURN"), method = "getRightText")
private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
if (PuzzleConfig.showPuzzleInfo) {

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

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