From 84e3f25b6e93a80da661a8010d48f0df95451f0b Mon Sep 17 00:00:00 2001 From: Abdel Date: Sat, 31 Aug 2024 18:05:45 +0200 Subject: [PATCH] =?UTF-8?q?Ladies=20and=20Gentlemen,=20i=20present=20to=20?= =?UTF-8?q?you:=20BugFix=E2=84=A2=20(https://github.com/Leclowndu93150/Mod?= =?UTF-8?q?ular-Angel-Ring/issues/3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../modular_angelring/common/AngelRingItem.java | 2 ++ .../modular_angelring/events/AngelRingClientEvents.java | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 28ad6fa..ee72a3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,7 +31,7 @@ mod_name=Modular Angel Ring mod_license=All Rights Reserved -mod_version=1.3.0 +mod_version=1.3.1 mod_group_id=com.leclowndu93150.modular_angelring diff --git a/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java b/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java index db2fa73..de483a1 100644 --- a/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java +++ b/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java @@ -1,5 +1,6 @@ package com.leclowndu93150.modular_angelring.common; +import com.leclowndu93150.modular_angelring.AngelRingMain; import com.leclowndu93150.modular_angelring.registry.DataComponentRegistry; import com.leclowndu93150.modular_angelring.registry.ItemRegistry; import com.leclowndu93150.modular_angelring.utils.FlightSpeedPercentage; @@ -17,6 +18,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.common.NeoForgeMod; import org.jetbrains.annotations.NotNull; import top.theillusivec4.curios.api.CuriosApi; diff --git a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingClientEvents.java b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingClientEvents.java index 708dada..d05cef2 100644 --- a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingClientEvents.java +++ b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingClientEvents.java @@ -17,9 +17,12 @@ import net.minecraft.world.level.Level; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.ModList; import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.loading.FMLLoader; import net.neoforged.neoforge.client.event.ClientTickEvent; import net.neoforged.neoforge.client.event.InputEvent; +import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.network.PacketDistributor; import top.theillusivec4.curios.api.CuriosApi; import top.theillusivec4.curios.api.SlotResult; @@ -88,7 +91,7 @@ public static void onClientTick(ClientTickEvent.Pre event){ double initialGamma = 1.0; double maxGamma = 9999.0; Player player = Minecraft.getInstance().player; - if (player == null) return; + if (player == null || ModList.get().isLoaded("fullbrightnesstoggle")) return; Optional slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get())); if (slotResult.isPresent()) { ItemStack angelRingStack = slotResult.get().stack();