second test

This commit is contained in:
2026-01-09 00:23:58 +01:00
parent 4fb4b669bc
commit d94e10a7ba
18 changed files with 107 additions and 13 deletions

View File

@@ -27,7 +27,7 @@ stonecutter {
centralScript = 'build.gradle'
create(rootProject) {
versions '1.20.1', '1.20.4', '1.20.6', '1.21.1', '1.21.4', '1.21.11'
versions '1.20', '1.20.1', '1.20.2', '1.20.3', '1.20.4', '1.20.5', '1.20.6', '1.21', '1.21.1', '1.21.2', '1.21.3', '1.21.4', '1.21.5', '1.21.6', '1.21.7', '1.21.8', '1.21.9', '1.21.10', '1.21.11'
vcsVersion = '1.21.11'
}
}

View File

@@ -19,7 +19,9 @@ public final class EnchantTooltipComponent implements ClientTooltipComponent {
private static final int TEXT_PADDING = 4;
private static final int BADGE_BG = 0xAA000000;
private static final int BADGE_TEXT = 0xFFFFFFFF;
private static final int FULL_BRIGHT = 0xF000F0;
//? if <1.21 {
/*private static final int FULL_BRIGHT = 0xF000F0;
*///?}
private final TooltipLayoutModel layout;
private final int iconSize;

View File

@@ -11,10 +11,12 @@ import dev.dekin.iconsenhanced.IconsEnhanced;
import dev.dekin.iconsenhanced.common.EnchEntry;
import dev.dekin.iconsenhanced.common.IconKeyResolver;
import dev.dekin.iconsenhanced.common.IconKeyResolver.Visual;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.enchantment.Enchantment;
//? if <1.21 {
/*import net.minecraft.core.registries.BuiltInRegistries;
*///?}
//? if >=1.21 {
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import net.minecraft.core.Holder;
@@ -37,20 +39,20 @@ public final class DefaultEnchantmentAdapter implements EnchantmentAdapter {
List<EnchEntry> entries = new ArrayList<>();
//? if >=1.21 {
appendEntries(entries, stack, stack.getEnchantments());
appendEntries(entries, stack.getEnchantments());
ItemEnchantments stored = stack.get(DataComponents.STORED_ENCHANTMENTS);
if (stored != null && !stored.isEmpty()) {
appendEntries(entries, stack, stored);
appendEntries(entries, stored);
}
//?} else {
/*Map<Enchantment, Integer> enchantments = EnchantmentHelper.getEnchantments(stack);
if (!enchantments.isEmpty()) {
appendEntries(entries, stack, enchantments);
appendEntries(entries, enchantments);
}
if (stack.getItem() instanceof EnchantedBookItem) {
ListTag list = EnchantedBookItem.getEnchantments(stack);
Map<Enchantment, Integer> stored = EnchantmentHelper.deserializeEnchantments(list);
appendEntries(entries, stack, stored);
appendEntries(entries, stored);
}
*///?}
@@ -58,26 +60,25 @@ public final class DefaultEnchantmentAdapter implements EnchantmentAdapter {
}
//? if >=1.21 {
private static void appendEntries(List<EnchEntry> entries, ItemStack stack, ItemEnchantments enchantments) {
private static void appendEntries(List<EnchEntry> entries, ItemEnchantments enchantments) {
if (enchantments == null || enchantments.isEmpty()) {
return;
}
for (Object2IntMap.Entry<Holder<Enchantment>> entry : enchantments.entrySet()) {
Holder<Enchantment> holder = entry.getKey();
Enchantment enchantment = holder.value();
int level = entry.getIntValue();
String id = holder.unwrapKey()
.map(key -> key.identifier().toString())
.orElse("");
boolean isCurse = holder.is(EnchantmentTags.CURSE);
Visual visual = IconKeyResolver.resolve(id, isCurse);
Component name = colorize(enchantment.getFullname(holder, level), visual.color);
Component name = colorize(Enchantment.getFullname(holder, level), visual.color);
String descKey = buildDescKey(id);
entries.add(new EnchEntry(id, level, name, isCurse, visual.iconKey, descKey));
}
}
//?} else {
/*private static void appendEntries(List<EnchEntry> entries, ItemStack stack, Map<Enchantment, Integer> enchantments) {
/*private static void appendEntries(List<EnchEntry> entries, Map<Enchantment, Integer> enchantments) {
if (enchantments == null || enchantments.isEmpty()) {
return;
}

View File

@@ -6,7 +6,7 @@ stonecutter.active "1.21.11"
tasks.register("chiseledBuild") {
group = "build"
dependsOn(stonecutter.tree.nodes.collect { it.project.tasks.named("build") })
dependsOn(stonecutter.tree.nodes.collect { it.project.tasks.named("remapJar") })
}
tasks.register("chiseledClean") {

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.91.6+1.20.2
# Java
java_version=17

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.91.1+1.20.3
# Java
java_version=17

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.97.8+1.20.5
# Java
java_version=21

View File

@@ -1,7 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.99.4+1.20.6
deps.fabric_api=0.100.8+1.20.6
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.83.0+1.20
# Java
java_version=17

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.138.4+1.21.10
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.106.1+1.21.2
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.114.1+1.21.3
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.128.2+1.21.5
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.128.2+1.21.6
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.129.0+1.21.7
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.136.1+1.21.8
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.134.1+1.21.9
# Java
java_version=21

View File

@@ -0,0 +1,7 @@
# Fabric dependencies
deps.fabric_loader=0.18.4
deps.fabric_api=0.102.0+1.21
# Java
java_version=21