- Update OroConfig and Multi-Item-Lib

Author: OroArmor

common/build.gradle

@@ -1,4 +1,5 @@
 repositories {
+    mavenCentral()
     maven {
         url = "https://dl.bintray.com/oroarmor/oroarmor"
     }
@@ -19,16 +20,11 @@ dependencies {
         exclude(module: "fabric-api")
     }
 
-    modCompile('com.oroarmor:oro-config:1.1.0') {
+    modCompile('com.oroarmor:oro-config-common:2.0.0') {
         exclude(module: "fabric-loader")
     }
 
-    include('com.oroarmor:oro-config:1.1.0') {
-        exclude(module: "fabric-loader")
-    }
-
-
-    modCompile('com.oroarmor:Multi-Item-Lib:1.1.1') {
+    modCompile('com.oroarmor:Multi-Item-Lib:1.2.0') {
         exclude(module: "fabric-api")
         exclude(module: "fabric-loader")
     }

fabric/build.gradle

@@ -16,7 +16,7 @@ architectury {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
     maven {
         name = "Fabric"
         url = "https://maven.fabricmc.net/"
@@ -105,16 +105,17 @@ dependencies {
     modCompile "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
 
     //Libraries
-    includeLibraries(['com.oroarmor:oro-config:1.2.0',
-                      'com.oroarmor:Multi-Item-Lib:1.1.1'])
+    includeLibraries(['com.oroarmor:oro-config-fabric:2.0.0',
+                      'com.oroarmor:Multi-Item-Lib:1.2.0'])
 
     runAndCompile(["net.kyrptonaught:quickshulker:${project.quickshulker}",
                    "com.github.emilyploszaj:trinkets:${project.trinkets}",
                    "com.misterpemodder:shulkerboxtooltip:${project.shulkerboxtooltip}+"+/*${project.minecraft_version}*/"1.16.4",
-                    "curse.maven:betterend-413596:3168267"
-    ], false)
+    ], true)
 
-    modCompile("io.github.prospector:modmenu:${project.modmenu}") {
+    modCompileOnly "curse.maven:betterend-413596:3203464"
+
+    modCompile("com.terraformersmc:modmenu:${project.modmenu}") {
         exclude(module: "fabric-api")
     }
 

fabric/gradle.properties

@@ -2,7 +2,7 @@
 shulkerboxtooltip=2.3.3
 trinkets=2.6.7
 quickshulker=1.1.6-1.16
-modmenu=1.15.0+build.1
+modmenu=1.16.8
 rei=5.2.1
 
 

fabric/src/main/java/com/oroarmor/netherite_plus/NetheritePlusModFabric.java

@@ -1,6 +1,9 @@
 package com.oroarmor.netherite_plus;
 
+import com.oroarmor.config.command.ConfigCommand;
+
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 
 public class NetheritePlusModFabric implements ModInitializer {
@@ -10,5 +13,6 @@ public void onInitialize() {
 		ServerLifecycleEvents.SERVER_STOPPED.register(l -> NetheritePlusMod.CONFIG.saveConfigToFile());
 
 		NetheritePlusMod.registerItemsWithMultiItemLib();
+		CommandRegistrationCallback.EVENT.register(new ConfigCommand(NetheritePlusMod.CONFIG)::register);
 	}
 }

fabric/src/main/java/com/oroarmor/netherite_plus/compatibility/ModMenuIntegration.java

@@ -1,12 +1,10 @@
 package com.oroarmor.netherite_plus.compatibility;
 
-import com.oroarmor.config.modmenu.ModMenuConfigScreen;
+import com.oroarmor.config.screen.ModMenuConfigScreen;
 import com.oroarmor.netherite_plus.NetheritePlusMod;
 
 public class ModMenuIntegration extends ModMenuConfigScreen {
-
 	public ModMenuIntegration() {
 		super(NetheritePlusMod.CONFIG);
 	}
-
 }

forge/build.gradle

@@ -13,6 +13,7 @@ architectury {
 }
 
 repositories {
+    mavenCentral()
     maven {
         url = "https://dl.bintray.com/oroarmor/oroarmor"
     }
@@ -32,10 +33,10 @@ dependencies {
         exclude(module: "fabric-loader")
     }
 
-    compile('com.oroarmor:oro-config:1.2.0') {
+    modCompile('com.oroarmor:oro-config-fabric:2.0.0') {
         exclude(module: "fabric-loader")
     }
-    shadow('com.oroarmor:oro-config:1.2.0') {
+    shadow('com.oroarmor:oro-config-forge:2.0.0') {
         exclude(module: "fabric-loader")
         exclude(module: "modmenu")
         exclude(module: "config-2")

forge/src/main/java/com/oroarmor/netherite_plus/ForgeNetheritePlusMod.java

@@ -9,6 +9,7 @@
 import com.oroarmor.netherite_plus.screen.NetheriteBeaconScreenHandler;
 import me.shedaniel.architectury.platform.forge.EventBuses;
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
@@ -27,7 +28,8 @@ public ForgeNetheritePlusMod() {
 		EventBuses.registerModEventBus(NetheritePlusMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus());
 		NetheritePlusMod.initialize();
 		DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> FMLJavaModLoadingContext.get().getModEventBus().register(new ForgeNetheritePlusModClient()));
-		FMLJavaModLoadingContext.get().getModEventBus().register(this);
+		MinecraftForge.EVENT_BUS.register(this);
+//		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, ()->new ForgeConfigScreen(NetheritePlusMod.CONFIG)::apply);
 
 		INSTANCE.registerMessage(0, UpdateNetheriteBeaconC2SPacket.class, (unb, fbb2) -> {
 			try {