From 63285ad28f793fa1d190322962769d099b9f5e2c Mon Sep 17 00:00:00 2001 From: Su5eD Date: Wed, 7 Aug 2024 13:42:49 +0200 Subject: [PATCH] Update MCPitanLib --- build.gradle.kts | 2 +- .../connectorextras/modmenu/mixin/MinecraftMixin.java | 5 +---- .../src/main/resources/META-INF/neoforge.mods.toml | 2 +- .../dev/su5ed/sinytra/connectorextras/ConnectorExtras.java | 2 +- .../su5ed/sinytra/connectorextras/misc/MCPitanLibBridge.java | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 83da9e2..de59d34 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -121,7 +121,7 @@ dependencies { includeProject("pehkui-bridge") // Misc - modImplementation("curse.maven:mcpitanlibarch-682213:4723157") + modImplementation("curse.maven:mcpitanlibarch-682213:5531565") } fun DependencyHandlerScope.includeProject(name: String) { diff --git a/modmenu-bridge/src/main/java/dev/su5ed/sinytra/connectorextras/modmenu/mixin/MinecraftMixin.java b/modmenu-bridge/src/main/java/dev/su5ed/sinytra/connectorextras/modmenu/mixin/MinecraftMixin.java index 96a1bd8..110844a 100644 --- a/modmenu-bridge/src/main/java/dev/su5ed/sinytra/connectorextras/modmenu/mixin/MinecraftMixin.java +++ b/modmenu-bridge/src/main/java/dev/su5ed/sinytra/connectorextras/modmenu/mixin/MinecraftMixin.java @@ -2,9 +2,6 @@ import dev.su5ed.sinytra.connectorextras.modmenu.ModMenuCompatSetup; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.RunArgs; -import net.minecraft.client.realms.RealmsClient; -import net.minecraft.resource.ResourceReload; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -14,7 +11,7 @@ public class MinecraftMixin { @Inject(method = "lambda$new$7", at = @At("HEAD")) - private void initModMenuCompat(RealmsClient realmsclient, ResourceReload reloadinstance, RunArgs arg, CallbackInfo ci) { + private void initModMenuCompat(CallbackInfo ci) { ModMenuCompatSetup.init(); } } diff --git a/modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml b/modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml index 4e87370..df6fbf7 100644 --- a/modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml +++ b/modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml @@ -24,7 +24,7 @@ Dummy mod provided by Connector Extras to allow mods detecting ModMenu to functi [[mixins]] config="mixins.connectorextras_modmenu_bridge.json" [[dependencies.connectorextras_modmenu_bridge]] - modId="forge" + modId="neoforge" mandatory=true versionRange="*" ordering="NONE" diff --git a/src/main/java/dev/su5ed/sinytra/connectorextras/ConnectorExtras.java b/src/main/java/dev/su5ed/sinytra/connectorextras/ConnectorExtras.java index 5881c8a..f1ecd91 100644 --- a/src/main/java/dev/su5ed/sinytra/connectorextras/ConnectorExtras.java +++ b/src/main/java/dev/su5ed/sinytra/connectorextras/ConnectorExtras.java @@ -10,7 +10,7 @@ public class ConnectorExtras { public ConnectorExtras(IEventBus bus) { if (ModList.get().isLoaded("mcpitanlibarch")) { -// MCPitanLibBridge.init(bus); + MCPitanLibBridge.init(bus); } } } diff --git a/src/main/java/dev/su5ed/sinytra/connectorextras/misc/MCPitanLibBridge.java b/src/main/java/dev/su5ed/sinytra/connectorextras/misc/MCPitanLibBridge.java index 57e9cd8..18efb11 100644 --- a/src/main/java/dev/su5ed/sinytra/connectorextras/misc/MCPitanLibBridge.java +++ b/src/main/java/dev/su5ed/sinytra/connectorextras/misc/MCPitanLibBridge.java @@ -1,8 +1,8 @@ package dev.su5ed.sinytra.connectorextras.misc; -import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; +import net.pitan76.mcpitanlib.api.item.CreativeTabManager; public final class MCPitanLibBridge {