Skip to content

Commit c386ee3

Browse files
Fix: allow different items with the same CMD to be mapped (#6)
1 parent e5c2d5d commit c386ee3

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.geysermc.rainbow.pack;
22

3-
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
4-
import it.unimi.dsi.fastutil.ints.IntSet;
3+
import com.mojang.datafixers.util.Pair;
54
import net.minecraft.core.Holder;
65
import net.minecraft.core.component.DataComponentPatch;
76
import net.minecraft.core.component.DataComponents;
@@ -44,7 +43,7 @@ public class BedrockPack {
4443
private final BedrockTextures.Builder itemTextures = BedrockTextures.builder();
4544
private final Set<BedrockItem> bedrockItems = new HashSet<>();
4645
private final Set<ResourceLocation> modelsMapped = new HashSet<>();
47-
private final IntSet customModelDataMapped = new IntOpenHashSet();
46+
private final Set<Pair<Item, Integer>> customModelDataMapped = new HashSet<>();
4847

4948
private final PackContext context;
5049
private final ProblemReporter reporter;
@@ -95,7 +94,7 @@ public void report(Problem problem) {
9594
CustomModelData customModelData = stack.get(DataComponents.CUSTOM_MODEL_DATA);
9695
Float firstNumber;
9796
if (customModelData == null || (firstNumber = customModelData.getFloat(0)) == null
98-
|| !customModelDataMapped.add((firstNumber.intValue()))) {
97+
|| !customModelDataMapped.add(Pair.of(stack.getItem(), firstNumber.intValue()))) {
9998
return MappingResult.NONE_MAPPED;
10099
}
101100

0 commit comments

Comments
 (0)