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

port: The Copper Age (1.21.9)

Browse Source 
Most changes were related to the MidnightLib 1.8.0 update
This commit is contained in:
Martin Prokoph
2025-10-01 19:00:00 +02:00
parent 97117ea46a
commit caee4c801a
7 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -3,7 +3,7 @@ import groovy.json.JsonOutput
plugins { plugins {
id "architectury-plugin" version "3.4-SNAPSHOT" id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
id "me.shedaniel.unified-publishing" version "0.1.+" apply false id "me.shedaniel.unified-publishing" version "0.1.+" apply false
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
} }

3
common/src/main/java/net/puzzlemc/gui/compat/BorderlessMiningCompat.java
View File

@@ -1,5 +1,6 @@
package net.puzzlemc.gui.compat; package net.puzzlemc.gui.compat;
import com.mojang.text2speech.OperatingSystem;
import link.infra.borderlessmining.config.ConfigHandler; import link.infra.borderlessmining.config.ConfigHandler;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@@ -17,7 +18,7 @@ public class BorderlessMiningCompat {
bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending()); bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());
bmConfig.save(); bmConfig.save();
})); }));
if (MinecraftClient.IS_SYSTEM_MAC) { if (OperatingSystem.get() == OperatingSystem.MAC_OS) {
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> { PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
bmConfig.enableMacOS = !bmConfig.enableMacOS; bmConfig.enableMacOS = !bmConfig.enableMacOS;
bmConfig.setEnabledPending(bmConfig.isEnabled()); bmConfig.setEnabledPending(bmConfig.isEnabled());

6
common/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
View File

@@ -5,6 +5,7 @@ import net.minecraft.client.gui.tab.GridScreenTab;
import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.Tab;
import net.minecraft.client.gui.tab.TabManager; import net.minecraft.client.gui.tab.TabManager;
import net.minecraft.client.gui.widget.TabNavigationWidget; import net.minecraft.client.gui.widget.TabNavigationWidget;
import net.minecraft.client.input.KeyInput;
import net.minecraft.screen.ScreenTexts; import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.puzzlemc.gui.PuzzleApi; import net.puzzlemc.gui.PuzzleApi;
@@ -75,9 +76,8 @@ public class PuzzleOptionsScreen extends Screen {
list.addAll(options); list.addAll(options);
} }
@Override @Override
public boolean keyPressed(int keyCode, int scanCode, int modifiers) { public boolean keyPressed(KeyInput input) {
if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true; return this.tabNavigation.keyPressed(input) || super.keyPressed(input);
return super.keyPressed(keyCode, scanCode, modifiers);
} }
@Override @Override
public void tick() { public void tick() {

14
common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java
View File

@@ -1,6 +1,9 @@
package net.puzzlemc.gui.screen.widget; package net.puzzlemc.gui.screen.widget;
import eu.midnightdust.lib.config.ButtonEntry;
import eu.midnightdust.lib.config.EntryInfo;
import eu.midnightdust.lib.config.MidnightConfig; import eu.midnightdust.lib.config.MidnightConfig;
import eu.midnightdust.lib.config.MidnightConfigListWidget;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
@@ -19,8 +22,7 @@ import java.util.List;
import static net.puzzlemc.core.PuzzleCore.LOGGER; import static net.puzzlemc.core.PuzzleCore.LOGGER;
@Environment(EnvType.CLIENT) public class PuzzleOptionListWidget extends MidnightConfigListWidget {
public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWidget {
TextRenderer textRenderer; TextRenderer textRenderer;
public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l) { public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l) {
@@ -51,7 +53,7 @@ public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWid
} }
} }
public void addButton(List<ClickableWidget> buttons, Text text) { public void addButton(List<ClickableWidget> buttons, Text text) {
MidnightConfig.EntryInfo info = new MidnightConfig.EntryInfo(null, "puzzle"); EntryInfo info = new EntryInfo(null, "puzzle");
if (buttons.isEmpty()) info.comment = new MidnightConfig.Comment(){ if (buttons.isEmpty()) info.comment = new MidnightConfig.Comment(){
public Class<? extends Annotation> annotationType() {return null;} public Class<? extends Annotation> annotationType() {return null;}
public boolean centered() {return true;} public boolean centered() {return true;}
@@ -60,12 +62,12 @@ public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWid
public String url() {return "";} public String url() {return "";}
public String requiredMod() {return "";} public String requiredMod() {return "";}
}; };
var entry = new MidnightConfig.ButtonEntry(buttons, text, info); var entry = new ButtonEntry(buttons, text, info);
this.addEntry(entry); this.addEntry(entry);
} }
public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
super.renderWidget(context, mouseX, mouseY, delta); super.renderWidget(context, mouseX, mouseY, delta);
MidnightConfig.ButtonEntry e = this.getHoveredEntry(); ButtonEntry e = this.getHoveredEntry();
if (client.currentScreen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() && if (client.currentScreen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() &&
e.text.getContent() instanceof TranslatableTextContent content) { e.text.getContent() instanceof TranslatableTextContent content) {
ClickableWidget button = e.buttons.getFirst(); ClickableWidget button = e.buttons.getFirst();
@@ -92,7 +94,7 @@ public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWid
} }
@Override @Override
public MidnightConfig.ButtonEntry getHoveredEntry() { public ButtonEntry getHoveredEntry() {
return super.getHoveredEntry(); return super.getHoveredEntry();
} }
} }

2
fabric/build.gradle
View File

@@ -26,7 +26,7 @@ dependencies {
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric") modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
modImplementation ("com.terraformersmc:modmenu:${project.modmenu_version}") { modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }

14
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.6 minecraft_version=1.21.9
supported_versions= supported_versions=
yarn_mappings=1.21.6+build.1 yarn_mappings=1.21.9+build.1
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
# Mod Properties # Mod Properties
mod_version = 2.1.1 mod_version = 2.1.2
maven_group = net.puzzlemc maven_group = net.puzzlemc
archives_base_name = puzzle archives_base_name = puzzle
release_type=release release_type=release
@@ -15,14 +15,14 @@ curseforge_id=563977
modrinth_id=3IuO68q1 modrinth_id=3IuO68q1
# Modloaders # Modloaders
fabric_loader_version=0.16.14 fabric_loader_version=0.17.2
fabric_api_version=0.127.0+1.21.6 fabric_api_version=0.133.14+1.21.9
neoforge_version=21.6.0-beta neoforge_version=21.9.3-beta
yarn_mappings_patch_neoforge_version = 1.21+build.4 yarn_mappings_patch_neoforge_version = 1.21+build.4
# Libraries # Libraries
midnightlib_version = 1.7.4+1.21.6 midnightlib_version = 1.8.1+1.21.9
modmenu_version = 15.0.0-beta.1 modmenu_version = 15.0.0-beta.1
# Mod Integrations # Mod Integrations

2
neoforge/src/main/java/net/puzzlemc/neoforge/PuzzleNeoForge.java
View File

@@ -21,7 +21,7 @@ public class PuzzleNeoForge {
ModList.get().getModContainerById(MOD_ID).orElseThrow().registerExtensionPoint(IConfigScreenFactory.class, (client, parent) -> new PuzzleOptionsScreen(parent)); ModList.get().getModContainerById(MOD_ID).orElseThrow().registerExtensionPoint(IConfigScreenFactory.class, (client, parent) -> new PuzzleOptionsScreen(parent));
} }
@EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) @EventBusSubscriber(modid = MOD_ID, value = Dist.CLIENT)
public static class MidnightLibBusEvents { public static class MidnightLibBusEvents {
@SubscribeEvent @SubscribeEvent
public static void onResourceReload(AddClientReloadListenersEvent event) { public static void onResourceReload(AddClientReloadListenersEvent event) {