Skip to content

Commit b54f754

Browse files
Smartin-bSmartin-b
committed
- added new glint related config option
1 parent b836cde commit b54f754

5 files changed

Lines changed: 115 additions & 27 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ and either create a GH issue or ping me on discord with the spark link and a des
2828
- added "fake_item_identity" (default false) field to "copy_item" ability, allowing to fake the items identity to a degree.
2929
this might be unsafe and accidentally convert the item to the fake identity, but in some conditions it might also fix
3030
the right click behaviour. Use with care.
31-
- reworked ability system and repaired keybind abilities to be fully functional again.
31+
- reworked ability system and repaired keybinding abilities to be fully functional again.
3232
- added bludgeon property
33-
- fixed mining speed ui not working on neoforge
33+
- fixed mining speed ui not working on neoforge
34+
- fix bug were fake enchantment levels would sometimes not work if the item was not enchanted
35+
- fix bug were sometimes ui stats would not merge correctly
36+
- now preferring vanilla tools for mining level comparison
37+
- added new config options do brighten materials for enchantment glint (Recommended)

‎common/src/main/java/smartin/miapi/config/MiapiClientConfig.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,13 @@ public static class EnchantingGlint {
120120
@AutoCodec.Name("enchanting_glint_speed")
121121
public float enchantingGlintSpeed = 1.0f;
122122

123+
@Comment("""
124+
Default speed of Color Change on enchanting Glint
125+
- DISABLE VANILLA LIKE!
126+
""")
127+
@AutoCodec.Name("material_color_brightening")
128+
public float materialColorBrigtening = 0.3f;
129+
123130
@Comment("""
124131
The Ratio of default color to Material Color.
125132
1.0 = only material, 0.0 is no material color.

‎common/src/main/java/smartin/miapi/material/base/Material.java‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import smartin.miapi.modules.ModuleInstance;
1414

1515
import java.util.ArrayList;
16+
import java.util.Collection;
1617
import java.util.List;
1718
import java.util.Optional;
1819

@@ -118,26 +119,37 @@ default List<Component> getDescription(boolean extended) {
118119
return lines;
119120
}
120121

122+
private static PickaxeItem preferMojang(Collection<PickaxeItem> candidates) {
123+
return candidates.stream()
124+
.sorted((a, b) -> {
125+
boolean aVanilla = a.builtInRegistryHolder().key().location().getNamespace().equals("minecraft");
126+
boolean bVanilla = b.builtInRegistryHolder().key().location().getNamespace().equals("minecraft");
127+
if (aVanilla && !bVanilla) return -1;
128+
if (!aVanilla && bVanilla) return 1;
129+
return 0; // otherwise leave them equal, or sort by name if you want
130+
})
131+
.findFirst()
132+
.orElse(null);
133+
}
134+
135+
121136
default List<Component> getMiningLevelToolTip() {
122-
Optional<PickaxeItem> pickaxeItem = Optional.ofNullable(TierManager.TAG_LOOK_UP.get(this.getIncorrectBlocksForDrops()));
123-
return pickaxeItem.map(item -> List.of(
124-
Component
125-
.translatable(
126-
"miapi.material.mining_level.pickaxe.description"
127-
),
128-
item.getName(item.getDefaultInstance()))).orElseGet(() -> List.of(
129-
Component
130-
.translatable(
131-
"miapi.material.mining_level.description"
132-
),
133-
Component
134-
.translatable(
135-
"tag.block." + this
136-
.getIncorrectBlocksForDrops()
137+
return TierManager.getPreferredPickaxe(this.getIncorrectBlocksForDrops())
138+
.map(pickaxe -> List.of(
139+
Component.translatable("miapi.material.mining_level.pickaxe.description"),
140+
pickaxe.getName(pickaxe.getDefaultInstance())
141+
))
142+
.orElseGet(() -> List.of(
143+
Component.translatable("miapi.material.mining_level.description"),
144+
Component.translatable(
145+
"tag.block." +
146+
this.getIncorrectBlocksForDrops()
137147
.location()
138148
.toString()
139149
.replace(":", ".")
140150
.replace("/", ".")
141-
)));
151+
)
152+
));
142153
}
154+
143155
}

‎common/src/main/java/smartin/miapi/material/generated/TierManager.java‎

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,60 @@
99
import java.util.HashMap;
1010
import java.util.List;
1111
import java.util.Map;
12+
import java.util.Optional;
13+
import java.util.stream.Collectors;
1214

1315
public class TierManager {
1416

15-
public static final Map<TagKey<Block>, PickaxeItem> TAG_LOOK_UP = new HashMap<>();
17+
private static final Map<TagKey<Block>, List<PickaxeItem>> TAG_LOOK_UP = new HashMap<>();
1618

1719
public static void setup() {
1820
TAG_LOOK_UP.clear();
21+
1922
List<PickaxeItem> pickaxeItems = GeneratedMaterialManager.getRegistry().stream()
2023
.filter(PickaxeItem.class::isInstance)
2124
.map(PickaxeItem.class::cast)
22-
.filter(pickaxe -> pickaxe.getTier() != null)
23-
.filter(pickaxe -> pickaxe.getTier().getIncorrectBlocksForDrops() != null)
25+
.filter(p -> p.getTier() != null && p.getTier().getIncorrectBlocksForDrops() != null)
2426
.toList();
2527

26-
for (PickaxeItem pickaxe : pickaxeItems) {
27-
TagKey<Block> tagKey = pickaxe.getTier().getIncorrectBlocksForDrops();
28-
if (tagKey != null) {
29-
TAG_LOOK_UP.put(tagKey, pickaxe);
30-
}
28+
TAG_LOOK_UP.putAll(
29+
pickaxeItems.stream()
30+
.collect(Collectors.groupingBy(
31+
p -> p.getTier().getIncorrectBlocksForDrops()
32+
))
33+
);
34+
}
35+
36+
/**
37+
* Returns the preferred pickaxe for this tag, preferring Mojang tools.
38+
*/
39+
public static Optional<PickaxeItem> getPreferredPickaxe(TagKey<Block> tag) {
40+
List<PickaxeItem> candidates = TAG_LOOK_UP.get(tag);
41+
if (candidates == null || candidates.isEmpty()) {
42+
return Optional.empty();
3143
}
44+
45+
// prefer namespace "minecraft"
46+
return candidates.stream()
47+
.sorted((a, b) -> {
48+
boolean aVanilla = isMojangItem(a);
49+
boolean bVanilla = isMojangItem(b);
50+
if (aVanilla && !bVanilla) return -1;
51+
if (!aVanilla && bVanilla) return 1;
52+
return a.getName(a.getDefaultInstance()).getString()
53+
.compareToIgnoreCase(b.getName(b.getDefaultInstance()).getString());
54+
})
55+
.findFirst();
56+
}
57+
58+
public static List<PickaxeItem> getAllPickaxes(TagKey<Block> tag) {
59+
return TAG_LOOK_UP.getOrDefault(tag, List.of());
60+
}
61+
62+
private static boolean isMojangItem(PickaxeItem item) {
63+
// for 1.20+, use item.builtInRegistryHolder().key().location().getNamespace()
64+
return item.arch$registryName() != null
65+
&& "minecraft".equals(item.arch$registryName().getNamespace());
3266
}
3367

3468

‎common/src/main/java/smartin/miapi/modules/properties/GlintProperty.java‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public GlintSettings getGlintSettings(ModuleInstance instance, ItemStack stack)
6868
}
6969
Material material = MaterialProperty.getMaterial(instance);
7070
if (material != null) {
71-
Color adjusted = new Color(material.getColor(instance, ItemDisplayContext.GUI));
71+
Color adjusted = brighten(new Color(material.getColor(instance, ItemDisplayContext.GUI)), MiapiConfig.getClientConfig().enchantingGlint.materialColorBrigtening);
7272
return defaultSettings.copyWithColor(adjustWith(
7373
adjusted,
7474
MiapiConfig.getClientConfig().enchantingGlint.materialRatioColor,
@@ -80,6 +80,37 @@ public GlintSettings getGlintSettings(ModuleInstance instance, ItemStack stack)
8080
return reference.get();
8181
}
8282

83+
/**
84+
* Brightens a color proportionally based on a factor.
85+
*
86+
* @param color The original color
87+
* @param factor Brightening factor: 0.0 = original, 1.0 = maximum brightness
88+
* @return A new brightened Color
89+
*/
90+
public static Color brighten(Color color, float factor) {
91+
92+
// Get RGB componentsg
93+
int r = color.r();
94+
int g = color.g();
95+
int b = color.b();
96+
97+
// Find the maximum component
98+
int max = Math.max(r, Math.max(g, b));
99+
100+
// If already at full brightness, return color
101+
if (max == 255) return color;
102+
103+
// Compute the scale factor to apply to each channel
104+
float scale = 1f + factor * ((255f / max) - 1f);
105+
106+
// Scale and clamp each channel
107+
r = Math.max(0, Math.min(255, Math.round(r * scale)));
108+
g = Math.max(0, Math.min(255, Math.round(g * scale)));
109+
b = Math.max(0, Math.min(255, Math.round(b * scale)));
110+
111+
return new Color(r, g, b, color.a());
112+
}
113+
83114
public List<Color> adjustWith(Color adjust, float percent, Color[] previous) {
84115
List<Color> adjusted = new ArrayList<>();
85116
for (int i = 0; i < previous.length; i++) {

0 commit comments

Comments
 (0)