From 43d4dd6adc8d45c906c6b889d0f4f4f4c3ceae00 Mon Sep 17 00:00:00 2001
From: Aleksey <bulldog.seregin@gmail.com>
Date: Tue, 4 May 2021 13:10:33 +0300
Subject: [PATCH] Server crash fix, again

---
 src/main/java/ru/betterend/client/BetterEndClient.java   | 2 ++
 .../java/ru/betterend/interfaces/MultiModelItem.java     | 9 +++++++++
 src/main/java/ru/betterend/registry/EndItems.java        | 3 ---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/betterend/client/BetterEndClient.java b/src/main/java/ru/betterend/client/BetterEndClient.java
index b9ba6104..5f52b0cc 100644
--- a/src/main/java/ru/betterend/client/BetterEndClient.java
+++ b/src/main/java/ru/betterend/client/BetterEndClient.java
@@ -7,6 +7,7 @@ import net.minecraft.core.Registry;
 import ru.betterend.BetterEnd;
 import ru.betterend.client.render.ERenderLayer;
 import ru.betterend.interfaces.IRenderTypeable;
+import ru.betterend.interfaces.MultiModelItem;
 import ru.betterend.registry.EndBlockEntityRenders;
 import ru.betterend.registry.EndEntitiesRenders;
 import ru.betterend.registry.EndModelProviders;
@@ -23,6 +24,7 @@ public class BetterEndClient implements ClientModInitializer {
 		EndParticles.register();
 		EndEntitiesRenders.register();
 		EndModelProviders.register();
+		MultiModelItem.register();
 		ClientOptions.init();
 		
 		if (BetterEnd.isDevEnvironment()) {
diff --git a/src/main/java/ru/betterend/interfaces/MultiModelItem.java b/src/main/java/ru/betterend/interfaces/MultiModelItem.java
index 74ae0772..9d0cbe59 100644
--- a/src/main/java/ru/betterend/interfaces/MultiModelItem.java
+++ b/src/main/java/ru/betterend/interfaces/MultiModelItem.java
@@ -2,8 +2,17 @@ package ru.betterend.interfaces;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import ru.betterend.registry.EndItems;
 
 public interface MultiModelItem {
 	@Environment(EnvType.CLIENT)
 	void registerModelPredicate();
+
+	static void register() {
+		EndItems.getModItems().forEach(item -> {
+			if (item instanceof MultiModelItem) {
+				((MultiModelItem) item).registerModelPredicate();
+			}
+		});
+	}
 }
diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java
index abbb4040..60288137 100644
--- a/src/main/java/ru/betterend/registry/EndItems.java
+++ b/src/main/java/ru/betterend/registry/EndItems.java
@@ -132,9 +132,6 @@ public class EndItems {
 			return item;
 		}
 		registerItem(id, item, MOD_ITEMS);
-		if (item instanceof MultiModelItem) {
-			((MultiModelItem) item).registerModelPredicate();
-		}
 		return item;
 	}