Merge remote-tracking branch 'remotes/origin/1.15' into 1.16

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/ModLoot.java
This commit is contained in:
modmuss50 2020-06-01 22:25:00 +01:00
commit bbc4b2b765
4 changed files with 39 additions and 12 deletions

View file

@ -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;
@ -54,10 +55,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<Block> wipBlocks = new ArrayList<>();
public static final Map<Item, Boolean> ITEM_ID = Maps.newHashMap();
public static void setup() {
ItemTooltipCallback.EVENT.register(new StackToolTipHandler());
@ -70,8 +73,10 @@ public class StackToolTipHandler implements ItemTooltipCallback {
@Override
public void getTooltip(ItemStack stack, TooltipContext tooltipContext, List<Text> components) {
Item item = stack.getItem();
if (!ITEM_ID.computeIfAbsent(item, this::isTRItem))
return;
// Machine info and upgrades helper section
Block block = Block.getBlockFromItem(item);
@ -131,7 +136,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;