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

Update to 1.18.1, New Icon, CEM integration, Better Iris integration

Browse Source
This commit is contained in:
Motschen
2021-12-30 12:42:18 +01:00
parent 066cc56268
commit d8ce15e5da
26 changed files with 147 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,13 +6,13 @@ import net.fabricmc.api.ClientModInitializer;
public class PuzzleCore implements ClientModInitializer {
public final static String version = "Puzzle R1";
public final static String version = "Puzzle B0";
public final static String name = "Puzzle";
public final static String id = "puzzle";
public final static String website = "https://github.com/PuzzleMC/Puzzle";
public static String updateURL = website; //+"download";
public final static String UPDATE_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle/1.17/puzzle_versions.json";
public final static String UPDATE_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle-Versions/main/puzzle_versions.json";
@Override
public void onInitializeClient() {

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

@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.List;
@Mixin(DebugHud.class)
public class MixinDebugHud extends DrawableHelper {
public abstract class MixinDebugHud extends DrawableHelper {
@Inject(at = @At("RETURN"), method = "getRightText", cancellable = true)
private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
if (PuzzleConfig.showPuzzleInfo) {

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

@@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Objects;
@Mixin(TitleScreen.class)
public class MixinTitleScreen extends Screen {
public abstract class MixinTitleScreen extends Screen {
@Shadow @Final private boolean doBackgroundFade;
@Shadow private long backgroundFadeStart;

BIN
puzzle-base/src/main/resources/assets/puzzle/icon.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

17
puzzle-base/src/main/resources/assets/puzzle/lang/en_us.json
View File

@@ -1,17 +0,0 @@
{
"puzzle.text.update_available":"An update is available!",
"puzzle.screen.title":"Puzzle Settings",
"puzzle.page.graphics":"Graphics Settings",
"puzzle.page.resources":"Resource Settings",
"puzzle.page.performance":"Performance Settings",
"puzzle.page.misc":"Miscellaneous Settings",
"puzzle.option.ctm":"Connected Textures",
"puzzle.option.inside_ctm":"Connect Inside Textures",
"puzzle.midnightconfig.title":"Title",
"puzzle.midnightconfig.showPuzzleInfo":"Show Puzzle Info",
"puzzle.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info",
"test.midnightconfig.title":"I am a title",
"test.midnightconfig.text":"I am a comment *u*",
"test.midnightconfig.showInfo":"Show Info",
"test.midnightconfig.showInfo.tooltip":"Show more information"
}

4
puzzle-base/src/main/resources/fabric.mod.json
View File

@@ -3,8 +3,8 @@
"id": "puzzle-base",
"version": "${version}",
"name": "Puzzle",
"description": "Unites optifine replacement mods in a clean & vanilla-style gui",
"name": "Puzzle Base",
"description": "Shared code between all Puzzle modules",
"authors": [
"PuzzleMC",
"Motschen"

2
puzzle-base/src/main/resources/puzzle-base.mixins.json
View File

@@ -1,7 +1,7 @@
{
"required": true,
"package": "net.puzzlemc.core.mixin",
"compatibilityLevel": "JAVA_8",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinTitleScreen",
"MixinDebugHud"