diff --git a/build.gradle b/build.gradle index 133b7edee..180ee8f66 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ group = 'TechReborn' dependencies { minecraft "com.mojang:minecraft:1.15.2" mappings "net.fabricmc:yarn:1.15.2+build.2:v2" - modImplementation "net.fabricmc:fabric-loader:0.7.5+build.178" + modImplementation "net.fabricmc:fabric-loader:0.8.4+build.198" //Fabric api modImplementation "net.fabricmc.fabric-api:fabric-api:0.4.29+build.290-1.15" diff --git a/src/main/java/techreborn/events/StackToolTipHandler.java b/src/main/java/techreborn/events/StackToolTipHandler.java index b6479edbc..a4ffe49ce 100644 --- a/src/main/java/techreborn/events/StackToolTipHandler.java +++ b/src/main/java/techreborn/events/StackToolTipHandler.java @@ -24,6 +24,7 @@ package techreborn.events; +import com.google.common.collect.Maps; import net.fabricmc.fabric.api.event.client.ItemTooltipCallback; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; @@ -53,10 +54,12 @@ import techreborn.utils.WIP; import java.util.ArrayList; import java.util.List; +import java.util.Map; public class StackToolTipHandler implements ItemTooltipCallback { private static ArrayList wipBlocks = new ArrayList<>(); + public static final Map ITEM_ID = Maps.newHashMap(); public static void setup() { ItemTooltipCallback.EVENT.register(new StackToolTipHandler()); @@ -69,8 +72,10 @@ public class StackToolTipHandler implements ItemTooltipCallback { @Override public void getTooltip(ItemStack stack, TooltipContext tooltipContext, List components) { Item item = stack.getItem(); - - + + if (!ITEM_ID.computeIfAbsent(item, this::isTRItem)) + return; + // Machine info and upgrades helper section Block block = Block.getBlockFromItem(item); @@ -130,7 +135,11 @@ public class StackToolTipHandler implements ItemTooltipCallback { } } } - + + private boolean isTRItem(Item item) { + return Registry.ITEM.getId(item).getNamespace().equals("techreborn"); + } + public int percentage(int MaxValue, int CurrentValue) { if (CurrentValue == 0) return 0;