Merge remote-tracking branch 'origin/7.x-1.18' into 7.x-1.18.2

# Conflicts:
#	gradle.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java

4 files changed, 13 insertions, 1 deletions

diff --git a/forge/build.gradle b/forge/build.gradle
index ff7bf5841..45bcac64a 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -95,7 +95,7 @@ dependencies {
     modRuntime("curse.maven:refined-storage-243076:3623324")
     modRuntime("appeng:appliedenergistics2:10.0.1")
     // modRuntime("curse.maven:tcon-74072:3273213")
-    // modRuntime("curse.maven:mantle-74924:3273201")
+    modRuntime("curse.maven:mantle-74924:3634761")
     modRuntime("curse.maven:jer-240630:3575590")
     modRuntime("curse.maven:jep-417645:3550303")
     modRuntime("curse.maven:simple-storage-network-268495:3594529")
@@ -130,6 +130,7 @@ dependencies {
     modRuntime("curse.maven:cyclops-core-236307:3614854")
     modRuntime("curse.maven:elemental-craft-395158:3593428")
     modRuntime("curse.maven:datapack-anvil-432817:3569515")
+    modRuntime("curse.maven:assemblylinemachines-388282:3623609")
 }
 
 shadowJar {
diff --git a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
index 6383e106c..563f5f31a 100644
--- a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
+++ b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
@@ -27,6 +27,8 @@ import me.shedaniel.rei.RoughlyEnoughItemsInitializer;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.data.loading.DatagenModLoader;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.IExtensionPoint;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -34,6 +36,7 @@ import org.jetbrains.annotations.ApiStatus;
 @ApiStatus.Internal
 public class RoughlyEnoughItemsForge {
     public RoughlyEnoughItemsForge() {
+        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> "", (a, b) -> true));
         if (!DatagenModLoader.isRunningDataGen()) {
             RoughlyEnoughItemsInitializer.onInitialize();
             DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> RoughlyEnoughItemsInitializer::onInitializeClient);
diff --git a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
index 25d7c82d2..54ed0c55f 100644
--- a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
@@ -43,4 +43,8 @@ public class RoughlyEnoughItemsInitializerImpl {
     public static boolean isDev() {
         return !FMLLoader.isProduction();
     }
+    
+    public static String getMinecraftVersion() {
+        return ModList.get().getModContainerById("minecraft").get().getModInfo().getVersion().toString();
+    }
 }
diff --git a/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java b/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java
index d57a39fb9..4f2babd20 100644
--- a/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java
+++ b/forge/src/serverComponent/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForgeServerComponent.java
@@ -26,15 +26,19 @@ package me.shedaniel.rei.forge;
 import me.shedaniel.rei.RoughlyEnoughItemsInitializer;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.data.loading.DatagenModLoader;
+import net.minecraftforge.fml.IExtensionPoint;
 import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.loading.FMLEnvironment;
+import net.minecraftforge.network.NetworkConstants;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 @Mod("roughlyenoughitems_servercomponent")
 public class RoughlyEnoughItemsForgeServerComponent {
     public RoughlyEnoughItemsForgeServerComponent() {
+        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
         Logger logger = LogManager.getLogger(RoughlyEnoughItemsForgeServerComponent.class);
         if (!DatagenModLoader.isRunningDataGen()) {
             if (FMLEnvironment.dist == Dist.CLIENT) {