Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ modstitch {
runDir("../../run")
}
}

mixin.useLegacyMixinAp = false
}
}

Expand Down Expand Up @@ -163,6 +161,16 @@ repositories {
}
}

// MDG 2.0.137 (via Modstitch 0.8.4) defaults to NFRT 2.0.18, which cannot build 26.3 see [neoforged/NeoForge#3490](https://github.com/neoforged/NeoForge/issues/3490)
// Remove once Modstitch updates to MDG 2.0.138 or later, which defaults to NFRT 2.0.31
configurations.all {
resolutionStrategy.eachDependency {
if (requested.group == "net.neoforged" && requested.name == "neoform-runtime") {
useVersion("2.0.31")
}
}
}

dependencies {
fun Dependency?.jij() = this?.also(::modstitchJiJ)

Expand Down
4 changes: 2 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
|---------------|--------|----------|-------|
| 26.1 | ✅ | ✅ | ❌ |
| 26.2 | ✅ | ✅ | ❌ |
| 26.3-snapshot | ✅ | ❌ | ❌ |
| 26.3 | ✅ | ✅ | ❌ |

### Changes

- Port to 26.3 snapshot 4
- Port to 26.3
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub.curseforgeSlug=yacl
pub.curseforgeId=667299
githubProject=isXander/YetAnotherConfigLib

deps.fabricLoader=0.19.3
deps.fabricLoader=0.19.5
deps.imageio=3.12.0
deps.quiltParsers=0.2.1
deps.fabricLangKotlin=1.12.3+kotlin.2.0.21
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pluginManagement {
}

plugins {
id("dev.kikugie.stonecutter") version "0.8.2"
id("dev.kikugie.stonecutter") version "0.9.8"
}

stonecutter {
Expand All @@ -25,7 +25,7 @@ stonecutter {

mc("26.1", loaders = listOf("fabric", "neoforge"))
mc("26.2", loaders = listOf("fabric", "neoforge"))
mc("26.3", loaders = listOf("fabric"))
mc("26.3", loaders = listOf("fabric", "neoforge"))
}
}
rootProject.name = "YetAnotherConfigLib"
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import dev.isxander.yacl3.gui.utils.KeyUtils;
import dev.isxander.yacl3.gui.utils.UndoRedoHelper;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.input.CharacterEvent;
import net.minecraft.client.input.KeyEvent;
Expand Down Expand Up @@ -113,6 +114,7 @@ private boolean isHoveredInputField(double mouseX, double mouseY) {
public boolean mouseClicked(@NonNull MouseButtonEvent event, boolean doubleClick) {
if (isAvailable() && getDimension().isPointInside((int) event.x(), (int) event.y())) {
inputFieldFocused = true;
updateTextInputFocus(true);

if (!isHoveredInputField(event.x(), event.y())) {
caretPos = getDefaultCaretPos();
Expand Down Expand Up @@ -432,6 +434,7 @@ protected int findSpaceIndex(boolean reverse) {
public void setFocused(boolean focused) {
super.setFocused(focused);
inputFieldFocused = focused;
updateTextInputFocus(focused);
}

@Override
Expand All @@ -440,6 +443,13 @@ public void unfocus() {
inputFieldFocused = false;
renderOffset = 0;
if (!instantApply) updateControl();
updateTextInputFocus(false);
}

private void updateTextInputFocus(boolean focused) {
//? if >=26.3 {
Minecraft.getInstance().onTextInputFocusChange(this, focused);
//?}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package dev.isxander.yacl3.gui.render;

//? if >=26.3 {
/*import com.mojang.renderpearl.api.pipeline.RenderPipeline;
*///?} else {
import com.mojang.blaze3d.pipeline.RenderPipeline;
//?}
import com.mojang.renderpearl.api.pipeline.RenderPipeline;
//?} else {
/*import com.mojang.blaze3d.pipeline.RenderPipeline;
*///?}
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.gui.navigation.ScreenRectangle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package dev.isxander.yacl3.gui.render;

//? if >=26.3 {
/*import com.mojang.renderpearl.api.pipeline.RenderPipeline;
*///?} else {
import com.mojang.blaze3d.pipeline.RenderPipeline;
//?}
import com.mojang.renderpearl.api.pipeline.RenderPipeline;
//?} else {
/*import com.mojang.blaze3d.pipeline.RenderPipeline;
*///?}
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.gui.navigation.ScreenRectangle;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/dev/isxander/yacl3/gui/utils/KeyUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ public static boolean hasControlDown() {

public static boolean isKeyDown(int key) {
//? if >=26.3 {
/*return InputConstants.isKeyDown(key);
*///?} else {
return InputConstants.isKeyDown(Minecraft.getInstance().getWindow(), key);
//?}
return InputConstants.isKeyDown(key);
//?} else {
/*return InputConstants.isKeyDown(Minecraft.getInstance().getWindow(), key);
*///?}
}

private KeyUtils() {
Expand Down
2 changes: 1 addition & 1 deletion stonecutter.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

val modstitchVersion = "0.8.4"
id("dev.isxander.modstitch.base") version modstitchVersion apply false
id("net.fabricmc.fabric-loom") version "1.15-SNAPSHOT" apply false
id("net.fabricmc.fabric-loom") version "1.17-SNAPSHOT" apply false

id("me.modmuss50.mod-publish-plugin") version "0.8.4" apply false
id("org.ajoberstar.grgit") version "5.0.+" apply false
Expand Down
8 changes: 4 additions & 4 deletions versions/26.3-fabric/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
modstitch.platform=fabric-loom

mcVersion=26.3-snapshot-4
mcVersion=26.3

deps.fabricApi=0.155.2+26.3

meta.mcDep=~26.3-
meta.mcDep=~26.3

pub.modrinthMC=26.3-snapshot-4
pub.curseMC=26.3-snapshot
pub.modrinthMC=26.3
pub.curseMC=26.3
12 changes: 12 additions & 0 deletions versions/26.3-neoforge/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
modstitch.platform=moddevgradle

mcVersion=26.3

deps.neoforge=26.3.0.7-beta
deps.kotlinForForge=6.0.0

meta.mcDep=[26.3,26.4)
meta.loaderDep=[26.3,26.4)

pub.modrinthMC=26.3
pub.curseMC=26.3
2 changes: 1 addition & 1 deletion versions/current
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26.2-fabric
26.3-fabric
Loading