diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-06-19 02:59:00 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-06-28 03:21:12 +0800 |
| commit | cc0aa41620654e6379196d96ea5a11cb9e1acac0 (patch) | |
| tree | 57acd2f7e522ce24b99946035f5ad18afa466734 | |
| parent | 62e44ab43188de4a353bc943747e81543f2dc782 (diff) | |
| download | RoughlyEnoughItems-cc0aa41620654e6379196d96ea5a11cb9e1acac0.tar.gz RoughlyEnoughItems-cc0aa41620654e6379196d96ea5a11cb9e1acac0.tar.bz2 RoughlyEnoughItems-cc0aa41620654e6379196d96ea5a11cb9e1acac0.zip | |
Fix #853
4 files changed, 97 insertions, 1 deletions
diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinRecipeToast.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinRecipeToast.java new file mode 100644 index 000000000..5f3be3316 --- /dev/null +++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinRecipeToast.java @@ -0,0 +1,47 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021, 2022 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.api.client.config.ConfigObject; +import net.minecraft.client.gui.components.toasts.RecipeToast; +import net.minecraft.client.gui.components.toasts.ToastComponent; +import net.minecraft.world.item.crafting.Recipe; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(RecipeToast.class) +public class MixinRecipeToast { + @Inject(method = "addOrUpdate", at = @At("HEAD"), cancellable = true) + private static void addOrUpdate(ToastComponent toastGui, Recipe<?> recipe, CallbackInfo info) { + if (disableRecipeBook()) info.cancel(); + } + + @Unique + private static boolean disableRecipeBook() { + return ConfigObject.getInstance().doesDisableRecipeBook(); + } +} diff --git a/fabric/src/main/resources/rei.mixins.json b/fabric/src/main/resources/rei.mixins.json index 75afec175..c70555b69 100644 --- a/fabric/src/main/resources/rei.mixins.json +++ b/fabric/src/main/resources/rei.mixins.json @@ -6,6 +6,7 @@ "client": [ "MixinClientPacketListener", "MixinEffectRenderingInventoryScreen", + "MixinRecipeToast", "MixinScreen" ], "mixins": [ diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinRecipeToast.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinRecipeToast.java new file mode 100644 index 000000000..a5197805e --- /dev/null +++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinRecipeToast.java @@ -0,0 +1,47 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021, 2022 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.forge; + +import me.shedaniel.rei.api.client.config.ConfigObject; +import net.minecraft.client.gui.components.toasts.RecipeToast; +import net.minecraft.client.gui.components.toasts.ToastComponent; +import net.minecraft.world.item.crafting.Recipe; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(RecipeToast.class) +public class MixinRecipeToast { + @Inject(method = "addOrUpdate", at = @At("HEAD"), cancellable = true) + private static void addOrUpdate(ToastComponent toastGui, Recipe<?> recipe, CallbackInfo info) { + if (disableRecipeBook()) info.cancel(); + } + + @Unique + private static boolean disableRecipeBook() { + return ConfigObject.getInstance().doesDisableRecipeBook(); + } +} diff --git a/forge/src/main/resources/rei.mixins.json b/forge/src/main/resources/rei.mixins.json index 07bfe64ce..16b67049b 100644 --- a/forge/src/main/resources/rei.mixins.json +++ b/forge/src/main/resources/rei.mixins.json @@ -4,7 +4,8 @@ "compatibilityLevel": "JAVA_8", "client": [ "MixinClientPacketListener", - "MixinEffectRenderingInventoryScreen" + "MixinEffectRenderingInventoryScreen", + "MixinRecipeToast" ], "mixins": [ ], |
