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

Browse Source
This commit is contained in:
Martin Prokoph
2024-06-16 18:53:43 +02:00
parent b3b49cb8b8
commit 651483af22
4 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gradle.properties
View File

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx4G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.20.6 minecraft_version=1.21
yarn_mappings=1.20.6+build.1 yarn_mappings=1.21+build.2
loader_version=0.15.10 loader_version=0.15.11
# Mod Properties # Mod Properties
mod_version = 1.6.2+1.20.6 mod_version = 1.6.3+1.21
maven_group = net.puzzlemc maven_group = net.puzzlemc
archives_base_name = puzzle archives_base_name = puzzle
release_type=release release_type=release
@@ -17,9 +17,9 @@ org.gradle.jvmargs=-Xmx4G
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.97.8+1.20.6 fabric_version=0.100.1+1.21
mod_menu_version = 7.0.1 mod_menu_version = 7.0.1
midnightlib_version = 1.5.5-fabric midnightlib_version = 1.5.7-fabric
cull_leaves_version = 3.0.2-fabric cull_leaves_version = 3.0.2-fabric
ldl_version = 2.3.2+1.20.1 ldl_version = 2.3.2+1.20.1

2
puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java
View File

@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class PuzzleApi { public class PuzzleApi {
private static Logger LOGGER = LogManager.getLogger("puzzle-gui"); private static final Logger LOGGER = LogManager.getLogger("puzzle-gui");
public static List<PuzzleWidget> GRAPHICS_OPTIONS = new ArrayList<>(); public static List<PuzzleWidget> GRAPHICS_OPTIONS = new ArrayList<>();
public static List<PuzzleWidget> MISC_OPTIONS = new ArrayList<>(); public static List<PuzzleWidget> MISC_OPTIONS = new ArrayList<>();

2
puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
View File

@@ -17,7 +17,7 @@ public class PuzzleClient implements ClientModInitializer {
public final static String id = "puzzle"; public final static String id = "puzzle";
public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN); public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN);
public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED); public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED);
public static final Identifier PUZZLE_BUTTON = new Identifier(id, "icon/button"); public static final Identifier PUZZLE_BUTTON = Identifier.of(id, "icon/button");
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {

17
puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
View File

@@ -1,13 +1,9 @@
package net.puzzlemc.splashscreen; package net.puzzlemc.splashscreen;
import com.mojang.blaze3d.platform.TextureUtil;
import com.mojang.blaze3d.systems.RenderSystem;
import eu.midnightdust.lib.util.MidnightColorUtil; import eu.midnightdust.lib.util.MidnightColorUtil;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.minecraft.client.texture.AbstractTexture;
import net.minecraft.client.texture.NativeImageBackedTexture; import net.minecraft.client.texture.NativeImageBackedTexture;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import net.minecraft.util.math.ColorHelper;
import net.puzzlemc.core.config.PuzzleConfig; import net.puzzlemc.core.config.PuzzleConfig;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
@@ -24,9 +20,10 @@ import net.minecraft.resource.ResourceType;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import java.awt.*; import java.io.File;
import java.io.*; import java.io.FileInputStream;
import java.net.URL; import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@@ -35,8 +32,8 @@ import java.util.Objects;
import java.util.Properties; import java.util.Properties;
public class PuzzleSplashScreen implements ClientModInitializer { public class PuzzleSplashScreen implements ClientModInitializer {
public static final Identifier LOGO = new Identifier("textures/gui/title/mojangstudios.png"); public static final Identifier LOGO = Identifier.of("textures/gui/title/mojangstudios.png");
public static final Identifier BACKGROUND = new Identifier("optifine/splash_background.png"); public static final Identifier BACKGROUND = Identifier.of("optifine/splash_background.png");
public static File CONFIG_PATH = new File(String.valueOf(FabricLoader.getInstance().getConfigDir().resolve(".puzzle_cache"))); public static File CONFIG_PATH = new File(String.valueOf(FabricLoader.getInstance().getConfigDir().resolve(".puzzle_cache")));
public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png"); public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png"); public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png");
@@ -66,7 +63,7 @@ public class PuzzleSplashScreen implements ClientModInitializer {
ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() { ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
@Override @Override
public Identifier getFabricId() { public Identifier getFabricId() {
return new Identifier("puzzle", "splash_screen"); return Identifier.of("puzzle", "splash_screen");
} }
@Override @Override
public void reload(ResourceManager manager) { public void reload(ResourceManager manager) {