Skip to content

Commit 0247e28

Browse files
committed
update modstitch and stonecutter
1 parent aa4180b commit 0247e28

File tree

17 files changed

+19
-20
lines changed

17 files changed

+19
-20
lines changed

buildSrc/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ repositories {
3030
dependencies {
3131
fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
3232

33-
implementation(plugin("dev.isxander.modstitch.base", "0.7.1-unstable"))
34-
implementation(plugin("dev.kikugie.stonecutter", "0.7.9"))
35-
implementation(plugin("fabric-loom", "1.14.4"))
36-
implementation(plugin("net.neoforged.moddev", "2.0.119"))
33+
implementation(plugin("dev.isxander.modstitch.base", "0.8.0"))
34+
implementation(plugin("dev.kikugie.stonecutter", "0.8.1"))
35+
implementation(plugin("fabric-loom", "1.14.9"))
36+
implementation(plugin("net.neoforged.moddev", "2.0.137"))
3737
}

buildSrc/src/main/kotlin/dev/isxander/controlify/project.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ plugins {
1010

1111
modstitch.apply {
1212
minecraftVersion = mcVersion
13-
javaVersion = 21
1413

1514
parchment {
1615
propMap("parchment.version") { mappingsVersion = it }

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ curseforgeSlug=controlify
1212
modrinthId=DOUdJVEm
1313
githubProject=isXander/Controlify
1414

15-
deps.fabricLoader=0.18.3
15+
deps.fabricLoader=0.18.4
1616
deps.sdl3Target=3.2.18.release-3.2.18
1717
deps.sdl34jBuild=79
1818
deps.hid4java=0.8.0
File renamed without changes.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pluginManagement {
2525
}
2626

2727
plugins {
28-
id("dev.kikugie.stonecutter") version "0.7.9"
28+
id("dev.kikugie.stonecutter") version "0.8.1"
2929
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
3030
}
3131

src/main/java/dev/isxander/controlify/gui/screen/ControllerCarouselScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public void focusOnEntry(int index) {
231231
@Override
232232
public void onControllerInput(ControllerEntity controller) {
233233
if (ControlifyBindings.GUI_ABSTRACT_ACTION_1.on(controller).justPressed()) {
234-
globalSettingsButton.onPress(/*? if >=1.21.9 >>*/ null );
234+
globalSettingsButton.onPress(/*? if >=1.21.9 >>*/null );
235235
}
236236
}
237237

src/main/java/dev/isxander/controlify/screenop/compat/vanilla/AbstractContainerScreenProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public AbstractContainerScreenProcessor(
5353
protected void handleScreenVMouse(ControllerEntity controller, VirtualMouseHandler vmouse) {
5454
var accessor = (AbstractContainerScreenAccessor) screen;
5555

56-
var ctx = new ContainerCtx(hoveredSlot.get(), screen.getMenu().getCarried(), accessor.invokeHasClickedOutside(vmouse.getCurrentX(1f), vmouse.getCurrentY(1f), accessor.getLeftPos(), accessor.getTopPos() /*? if <1.21.9 >>*/ /*,0*/ ), controller, controller.genericConfig().config().guideVerbosity);
56+
var ctx = new ContainerCtx(hoveredSlot.get(), screen.getMenu().getCarried(), accessor.invokeHasClickedOutside(vmouse.getCurrentX(1f), vmouse.getCurrentY(1f), accessor.getLeftPos(), accessor.getTopPos() /*? if <1.21.9 >>*//*,0*/ ), controller, controller.genericConfig().config().guideVerbosity);
5757
GuideDomains.CONTAINER.updateGuides(ctx, minecraft.font);
5858

5959
Slot hoveredSlot = this.hoveredSlot.get();

src/main/java/dev/isxander/controlify/screenop/compat/vanilla/JoinMultiplayerScreenProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ protected void handleButtons(ControllerEntity controller) {
4747
Button directConnectButton = this.directConnectButtonSupplier.get();
4848
if (directConnectButton != null) {
4949
playClackSound();
50-
directConnectButton.onPress(/*? if >=1.21.9 >>*/ null );
50+
directConnectButton.onPress(/*? if >=1.21.9 >>*/null );
5151
}
5252
}
5353

5454
if (ControlifyBindings.GUI_ABSTRACT_ACTION_2.on(controller).guiPressed().get()) {
5555
Button addServerButton = this.addServerButtonSupplier.get();
5656
if (addServerButton != null) {
5757
playClackSound();
58-
addServerButton.onPress(/*? if >=1.21.9 >>*/ null );
58+
addServerButton.onPress(/*? if >=1.21.9 >>*/null );
5959
}
6060
}
6161

src/main/java/dev/isxander/controlify/utils/render/CGuiElementRenderState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ default VertexConsumer add2DVertex(
6565
float x, float y, float z
6666
) {
6767
//? if >=1.21.6 {
68-
return vertexConsumer.addVertexWith2DPose(pose, x, y /*? if <1.21.9 >>*/ /*,z*/ );
68+
return vertexConsumer.addVertexWith2DPose(pose, x, y /*? if <1.21.9 >>*//*,z*/ );
6969
//?} else {
7070
/*return vertexConsumer.addVertex(pose, x, y, z);
7171
*///?}

src/main/templates/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"icon": "icon.png",
3232
"depends": {
33-
"fabricloader": ">=0.17.0",
33+
"fabricloader": ">=0.18.0",
3434
"minecraft": "${mc}",
3535
"java": ">=21",
3636
"yet_another_config_lib_v3": ">=3.8.0"

0 commit comments

Comments
 (0)