Skip to content

Commit f9473bb

Browse files
committed
fix dependency support
1 parent 07d6c5b commit f9473bb

8 files changed

Lines changed: 12 additions & 15 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ dependencies {
9898
}
9999

100100
// sodium compat
101-
modDependency("sodium", { "maven.modrinth:sodium:$it" })
101+
modDependency("sodium", { "net.caffeinemc:sodium-$it" })
102102
// RSO compat
103103
modDependency("reesesSodiumOptions", { "maven.modrinth:reeses-sodium-options:$it" })
104104
// iris compat

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ repositories {
6767
strictMaven("https://maven.nucleoid.xyz/releases") {
6868
includeGroupAndSubgroups("eu.pb4")
6969
}
70+
strictMaven("https://maven.caffeinemc.net/releases") {
71+
includeGroupAndSubgroups("net.caffeinemc")
72+
}
7073
maven("https://maven.isxander.dev/releases")
7174
}
7275

src/main/java/dev/isxander/controlify/ControlifyBootstrap.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,9 @@ public void onInitialize() {
2727
}
2828
//?} elif neoforge {
2929
/*import dev.isxander.controlify.gui.screen.ModConfigOpenerScreen;
30-
import net.neoforged.api.distmarker.Dist;
3130
import net.neoforged.bus.api.IEventBus;
3231
import net.neoforged.fml.ModLoadingContext;
3332
import net.neoforged.fml.common.Mod;
34-
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
35-
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
36-
import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
37-
import net.neoforged.fml.loading.FMLEnvironment;
38-
import net.neoforged.neoforge.common.NeoForge;
3933
4034
@Mod("controlify")
4135
public class ControlifyBootstrap {

src/main/java/dev/isxander/controlify/compatibility/ControlifyCompat.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public static void init() {
3030
//?}
3131

3232
//? if fancy_menu {
33-
/*try {
33+
try {
3434
wrapCompatCall(
3535
FANCY_MENU,
3636
dev.isxander.controlify.compatibility.fancymenu.FancyMenuCompat::registerActions
3737
);
3838
} catch (NoClassDefFoundError e) {
3939
disabledMods.add(FANCY_MENU);
4040
}
41-
*///?}
41+
//?}
4242
}
4343

4444
private static void wrapCompatCall(String modid, Runnable runnable) throws NoClassDefFoundError {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//? if fancy_menu {
2-
/*package dev.isxander.controlify.compatibility.fancymenu;
2+
package dev.isxander.controlify.compatibility.fancymenu;
33

44
import de.keksuccino.fancymenu.customization.action.ActionRegistry;
55

@@ -8,4 +8,4 @@ public static void registerActions() {
88
ActionRegistry.register(new OpenControlifySettingsAction());
99
}
1010
}
11-
*///?}
11+
//?}

src/main/java/dev/isxander/controlify/compatibility/fancymenu/OpenControlifySettingsAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//? if fancy_menu {
2-
/*package dev.isxander.controlify.compatibility.fancymenu;
2+
package dev.isxander.controlify.compatibility.fancymenu;
33

44
import de.keksuccino.fancymenu.customization.action.Action;
55
import dev.isxander.controlify.gui.screen.ControlifySettingsScreen;
@@ -43,4 +43,4 @@ public void execute(@Nullable String s) {
4343
return "";
4444
}
4545
}
46-
*///?}
46+
//?}

versions/26.1-fabric/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mcVersion=26.1.1
55
deps.fabricApi=0.144.3+26.1
66
deps.yacl=3.9.0+26.1-fabric
77
deps.modMenu=18.0.0-alpha.7
8-
deps.sodium=mc26.1.1-0.8.9-fabric
8+
deps.sodium=fabric:0.8.9+mc26.1.1
99
deps.iris=1.10.9+26.1-fabric
1010
deps.simpleVoiceChat=fabric-2.6.15+26.1.1
1111
deps.fancyMenu=3.8.6-26.1.1-fabric

versions/26.1-neoforge/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mcVersion=26.1.1
44

55
deps.neoForge=26.1.1.15-beta
66
deps.yacl=3.9.2+26.1-neoforge
7-
deps.sodium=mc26.1.1-0.8.9-neoforge
7+
deps.sodium=neoforge:0.8.9+mc26.1.1
88
deps.iris=1.10.9+26.1-neoforge
99
deps.simpleVoiceChat=neoforge-2.6.15+26.1.1
1010
deps.fancyMenu=3.8.6-26.1.1-neoforge

0 commit comments

Comments
 (0)