Lukas/bookshelf-inspector
1
0
Fork 0
mirror of https://github.com/lukasabbe/bookshelf-inspector.git synced 2026-04-30 10:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed last things for 1.21.4

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+3 -1
View File
@@ -26,7 +26,9 @@ dependencies {
"fabric-api-base", "fabric-api-base",
"fabric-networking-api-v1", "fabric-networking-api-v1",
"fabric-lifecycle-events-v1", "fabric-lifecycle-events-v1",
"fabric-resource-loader-v0" "fabric-resource-loader-v0",
"fabric-client-tags-api-v1",
"fabric-convention-tags-v2",
] ]
apiMudules.forEach { apiMudules.forEach {
gradle.properties
+1 -1
View File
@@ -11,7 +11,7 @@ maven_group=me.lukasabbe
archives_base_name=Bookshelfinspector archives_base_name=Bookshelfinspector
# Dependencies # Dependencies
fabric_version=0.110.0+1.21.4 fabric_version=0.110.3+1.21.4
cloth_config=16.0.141 cloth_config=16.0.141
modmenu=12.0.0-beta.1 modmenu=12.0.0-beta.1
YAML_snake=2.2 YAML_snake=2.2
src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java
+10 -6
View File
@@ -52,17 +52,21 @@ public class HudRenderer {
final int level = storedComponents.getLevel(enchantment); final int level = storedComponents.getLevel(enchantment);
if(level != 1) if(level != 1)
lvl = String.valueOf(level); lvl = String.valueOf(level);
final MutableText append; final MutableText enchantmentText;
if(!BookshelfinspectorClient.config.useRoman || level == -1) 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 else
append = enchantment.value().description().copy().append(" " + RomanNumerals.toRoman(level)); enchantmentText = enchantment.value().description().copy();
if(enchantment.isIn(EnchantmentTags.CURSE)) { if(enchantment.isIn(EnchantmentTags.CURSE)) {
Texts.setStyleIfAbsent(append, Style.EMPTY.withColor(Formatting.RED)); Texts.setStyleIfAbsent(enchantmentText, Style.EMPTY.withColor(Formatting.RED));
}else { }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); i+=(int)(10*scaleFactor);
} }
} }
src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java
+3 -3
View File
@@ -8,17 +8,16 @@ import me.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPa
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; 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.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.ChiseledBookshelfBlock; 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.client.MinecraftClient;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.HitResult; import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import java.util.Optional;
import java.util.OptionalInt; import java.util.OptionalInt;
import static me.lukasabbe.bookshelfinspector.BookshelfinspectorClient.*; import static me.lukasabbe.bookshelfinspector.BookshelfinspectorClient.*;
@@ -53,6 +52,7 @@ public class Inspector {
} }
bookShelfData.latestPos = pos; bookShelfData.latestPos = pos;
if(client.player.getWorld().getBlockState(pos).isOf(Blocks.CHISELED_BOOKSHELF)){ if(client.player.getWorld().getBlockState(pos).isOf(Blocks.CHISELED_BOOKSHELF)){
bookShelfInspect(pos, blockHitResult, client); bookShelfInspect(pos, blockHitResult, client);
}else if(client.player.getWorld().getBlockState(pos).isOf(Blocks.LECTERN) && config.lecternToggle){ }else if(client.player.getWorld().getBlockState(pos).isOf(Blocks.LECTERN) && config.lecternToggle){