fixed last things for 1.21.4

This commit is contained in:
lukasabbe
2024-12-02 15:42:03 +01:00
parent a389be9664
commit 2e660089fb
4 changed files with 17 additions and 11 deletions
@@ -52,17 +52,21 @@ public class HudRenderer {
final int level = storedComponents.getLevel(enchantment);
if(level != 1)
lvl = String.valueOf(level);
final MutableText append;
final MutableText enchantmentText;
if(!BookshelfinspectorClient.config.useRoman || level == -1)
append = enchantment.value().description().copy().append(" " + lvl);
enchantmentText = enchantment.value().description().copy().append(" " + lvl);
else if (level != 1)
enchantmentText = enchantment.value().description().copy().append(" " + RomanNumerals.toRoman(level));
else
append = enchantment.value().description().copy().append(" " + RomanNumerals.toRoman(level));
enchantmentText = enchantment.value().description().copy();
if(enchantment.isIn(EnchantmentTags.CURSE)) {
Texts.setStyleIfAbsent(append, Style.EMPTY.withColor(Formatting.RED));
Texts.setStyleIfAbsent(enchantmentText, Style.EMPTY.withColor(Formatting.RED));
}else {
Texts.setStyleIfAbsent(append, Style.EMPTY.withColor(Formatting.GRAY));
Texts.setStyleIfAbsent(enchantmentText, Style.EMPTY.withColor(Formatting.GRAY));
}
drawScaledText(context, append, x,y+i, 0xFFFFFFFF,client.textRenderer);
drawScaledText(context, enchantmentText, x,y+i, 0xFFFFFFFF,client.textRenderer);
i+=(int)(10*scaleFactor);
}
}
@@ -8,17 +8,16 @@ import me.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPa
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.ChiseledBookshelfBlock;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.block.entity.LecternBlockEntity;
import net.minecraft.client.MinecraftClient;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos;
import java.util.Optional;
import java.util.OptionalInt;
import static me.lukasabbe.bookshelfinspector.BookshelfinspectorClient.*;
@@ -53,6 +52,7 @@ public class Inspector {
}
bookShelfData.latestPos = pos;
if(client.player.getWorld().getBlockState(pos).isOf(Blocks.CHISELED_BOOKSHELF)){
bookShelfInspect(pos, blockHitResult, client);
}else if(client.player.getWorld().getBlockState(pos).isOf(Blocks.LECTERN) && config.lecternToggle){