Skip to content

Commit 7f35e63

Browse files
author
Smartin
committed
- added warning in case truly modular is started with iris enabled
1 parent 7fd0279 commit 7f35e63

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

common/src/main/java/smartin/miapi/Miapi.java

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import dev.architectury.event.events.common.LifecycleEvent;
88
import dev.architectury.event.events.common.PlayerEvent;
99
import dev.architectury.registry.ReloadListenerRegistry;
10-
import net.minecraft.client.network.ClientPlayerEntity;
1110
import net.minecraft.nbt.NbtCompound;
1211
import net.minecraft.resource.ResourceType;
1312
import net.minecraft.server.MinecraftServer;
@@ -51,7 +50,6 @@ public class Miapi {
5150
public static Gson gson = new Gson();
5251

5352
public static void init() {
54-
ClientPlayerEntity clientPlayerEntity;
5553
MiapiConfig.getInstance();
5654
setupNetworking();
5755
RegistryInventory.setup();

common/src/main/java/smartin/miapi/client/MiapiClient.java

+17-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44
import dev.architectury.event.events.client.ClientLifecycleEvent;
55
import dev.architectury.event.events.client.ClientPlayerEvent;
66
import dev.architectury.event.events.client.ClientReloadShadersEvent;
7+
import dev.architectury.platform.Platform;
78
import dev.architectury.registry.client.level.entity.EntityRendererRegistry;
89
import dev.architectury.registry.client.rendering.BlockEntityRendererRegistry;
910
import dev.architectury.registry.menu.MenuRegistry;
1011
import net.minecraft.client.MinecraftClient;
1112
import net.minecraft.client.render.VertexFormats;
1213
import net.minecraft.client.world.ClientWorld;
1314
import net.minecraft.resource.ReloadableResourceManagerImpl;
15+
import net.minecraft.text.ClickEvent;
16+
import net.minecraft.text.Style;
17+
import net.minecraft.text.Text;
1418
import net.minecraft.util.Identifier;
1519
import smartin.miapi.Miapi;
1620
import smartin.miapi.blocks.ModularWorkBenchRenderer;
@@ -45,7 +49,17 @@ public static void init() {
4549
ClientLifecycleEvent.CLIENT_SETUP.register(MiapiClient::clientSetup);
4650
ClientLifecycleEvent.CLIENT_STARTED.register(MiapiClient::clientStart);
4751
ClientLifecycleEvent.CLIENT_LEVEL_LOAD.register(MiapiClient::clientLevelLoad);
48-
ClientPlayerEvent.CLIENT_PLAYER_JOIN.register(player -> new Thread(()-> MiapiPermissions.getPerms(player)).start());
52+
ClientPlayerEvent.CLIENT_PLAYER_JOIN.register(player -> new Thread(() -> MiapiPermissions.getPerms(player)).start());
53+
ClientPlayerEvent.CLIENT_PLAYER_JOIN.register(player -> {
54+
if (Platform.isModLoaded("iris")) {
55+
player.sendMessage(Text.literal("Truly Modular is sadly not compatible with Iris."));
56+
player.sendMessage(Text.literal("This is due to Iris not allowing Mods to implement custom shaders."));
57+
ClickEvent event = new ClickEvent(ClickEvent.Action.OPEN_URL,"https://github.com/IrisShaders/Iris/blob/1.20.1/docs/development/compatibility/core-shaders.md");
58+
Text link = Text.literal("For more information you can read this");
59+
link = link.getWithStyle(Style.EMPTY.withClickEvent(event).withUnderline(true)).get(0);
60+
player.sendMessage(link);
61+
}
62+
});
4963
ClientReloadShadersEvent.EVENT.register((resourceFactory, asd) -> ModularItemCache.discardCache());
5064
RegistryInventory.modularItems.addCallback((item -> {
5165
ModularModelPredicateProvider.registerModelOverride(item, new Identifier(Miapi.MOD_ID, "damage"), (stack, world, entity, seed) -> {
@@ -54,12 +68,12 @@ public static void init() {
5468
ModularModelPredicateProvider.registerModelOverride(item, new Identifier(Miapi.MOD_ID, "damaged"), (stack, world, entity, seed) -> stack.isDamaged() ? 1.0F : 0.0F);
5569
}));
5670
ReloadEvents.START.subscribe(isClient -> {
57-
if(isClient){
71+
if (isClient) {
5872
StatListWidget.onReload();
5973
}
6074
});
6175
ReloadEvents.END.subscribe(isClient -> {
62-
if(isClient){
76+
if (isClient) {
6377
StatListWidget.reloadEnd();
6478
}
6579
});

0 commit comments

Comments
 (0)