From 745f78a4aa7d23fe03e7420eb3fe06b8c418db35 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 17 May 2021 21:41:03 +0800 Subject: Implement ErrorDisplayer on Fabric properly --- .../fabric/RoughlyEnoughItemsInitializerImpl.java | 7 ++++ .../rei/impl/client/fabric/ErrorDisplayerImpl.java | 38 +++++++++++++++++++ .../me/shedaniel/rei/mixin/fabric/MixinScreen.java | 44 ++++++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/ErrorDisplayerImpl.java create mode 100644 fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinScreen.java (limited to 'fabric/src/main/java') diff --git a/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java b/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java index d7200f47c..47f671dc0 100644 --- a/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java +++ b/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java @@ -57,6 +57,9 @@ public class RoughlyEnoughItemsInitializerImpl { break; } } + if (!FabricLoader.getInstance().isModLoaded("architectury")) { + RoughlyEnoughItemsState.error("Architectury API is not installed!", "https://www.curseforge.com/minecraft/mc-mods/architectury-fabric/files/all"); + } if (isClient()) { try { if (!FabricLoader.getInstance().isModLoaded("cloth-config2")) { @@ -69,4 +72,8 @@ public class RoughlyEnoughItemsInitializerImpl { } } } + + public static boolean isDev() { + return FabricLoader.getInstance().isDevelopmentEnvironment(); + } } diff --git a/fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/ErrorDisplayerImpl.java b/fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/ErrorDisplayerImpl.java new file mode 100644 index 000000000..ae6a0f9f3 --- /dev/null +++ b/fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/ErrorDisplayerImpl.java @@ -0,0 +1,38 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package me.shedaniel.rei.impl.client.fabric; + +import net.minecraft.client.gui.screens.Screen; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +public class ErrorDisplayerImpl { + public static List> consumerList = new ArrayList<>(); + + public static void registerGuiInit(Consumer consumer) { + consumerList.add(consumer); + } +} diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinScreen.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinScreen.java new file mode 100644 index 000000000..a14577a7f --- /dev/null +++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinScreen.java @@ -0,0 +1,44 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package me.shedaniel.rei.mixin.fabric; + +import me.shedaniel.rei.impl.client.fabric.ErrorDisplayerImpl; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.function.Consumer; + +@Mixin(Screen.class) +public class MixinScreen { + @Inject(method = "init(Lnet/minecraft/client/Minecraft;II)V", at = @At("HEAD")) + private void init(Minecraft minecraft, int i, int j, CallbackInfo ci) { + for (Consumer consumer : ErrorDisplayerImpl.consumerList) { + consumer.accept((Screen) (Object) this); + } + } +} -- cgit