Server crash fix, again

This commit is contained in:
Aleksey 2021-05-04 13:10:33 +03:00
parent a843f69977
commit 43d4dd6adc
3 changed files with 11 additions and 3 deletions

View file

@ -7,6 +7,7 @@ import net.minecraft.core.Registry;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.client.render.ERenderLayer; import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.interfaces.IRenderTypeable;
import ru.betterend.interfaces.MultiModelItem;
import ru.betterend.registry.EndBlockEntityRenders; import ru.betterend.registry.EndBlockEntityRenders;
import ru.betterend.registry.EndEntitiesRenders; import ru.betterend.registry.EndEntitiesRenders;
import ru.betterend.registry.EndModelProviders; import ru.betterend.registry.EndModelProviders;
@ -23,6 +24,7 @@ public class BetterEndClient implements ClientModInitializer {
EndParticles.register(); EndParticles.register();
EndEntitiesRenders.register(); EndEntitiesRenders.register();
EndModelProviders.register(); EndModelProviders.register();
MultiModelItem.register();
ClientOptions.init(); ClientOptions.init();
if (BetterEnd.isDevEnvironment()) { if (BetterEnd.isDevEnvironment()) {

View file

@ -2,8 +2,17 @@ package ru.betterend.interfaces;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import ru.betterend.registry.EndItems;
public interface MultiModelItem { public interface MultiModelItem {
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
void registerModelPredicate(); void registerModelPredicate();
static void register() {
EndItems.getModItems().forEach(item -> {
if (item instanceof MultiModelItem) {
((MultiModelItem) item).registerModelPredicate();
}
});
}
} }

View file

@ -132,9 +132,6 @@ public class EndItems {
return item; return item;
} }
registerItem(id, item, MOD_ITEMS); registerItem(id, item, MOD_ITEMS);
if (item instanceof MultiModelItem) {
((MultiModelItem) item).registerModelPredicate();
}
return item; return item;
} }