GeyserMC-Mirror/Rainbow
1
0
Fork 0
mirror of https://github.com/GeyserMC/Rainbow.git synced 2025-12-19 14:59:16 +00:00
Code Issues Releases Activity

Fix: allow different items with the same CMD to be mapped (#6)

Browse Source
This commit is contained in:
Eclipse
2025-10-20 08:43:59 +00:00
parent e5c2d5d435
commit c386ee31f6
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java
View File

@@ -1,7 +1,6 @@
package org.geysermc.rainbow.pack; package org.geysermc.rainbow.pack;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import com.mojang.datafixers.util.Pair;
import it.unimi.dsi.fastutil.ints.IntSet;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;
import net.minecraft.core.component.DataComponentPatch; import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.component.DataComponents; import net.minecraft.core.component.DataComponents;
@@ -44,7 +43,7 @@ public class BedrockPack {
private final BedrockTextures.Builder itemTextures = BedrockTextures.builder(); private final BedrockTextures.Builder itemTextures = BedrockTextures.builder();
private final Set<BedrockItem> bedrockItems = new HashSet<>(); private final Set<BedrockItem> bedrockItems = new HashSet<>();
private final Set<ResourceLocation> modelsMapped = new HashSet<>(); private final Set<ResourceLocation> modelsMapped = new HashSet<>();
private final IntSet customModelDataMapped = new IntOpenHashSet(); private final Set<Pair<Item, Integer>> customModelDataMapped = new HashSet<>();
private final PackContext context; private final PackContext context;
private final ProblemReporter reporter; private final ProblemReporter reporter;
@@ -95,7 +94,7 @@ public class BedrockPack {
CustomModelData customModelData = stack.get(DataComponents.CUSTOM_MODEL_DATA); CustomModelData customModelData = stack.get(DataComponents.CUSTOM_MODEL_DATA);
Float firstNumber; Float firstNumber;
if (customModelData == null || (firstNumber = customModelData.getFloat(0)) == null if (customModelData == null || (firstNumber = customModelData.getFloat(0)) == null
|| !customModelDataMapped.add((firstNumber.intValue()))) { || !customModelDataMapped.add(Pair.of(stack.getItem(), firstNumber.intValue()))) {
return MappingResult.NONE_MAPPED; return MappingResult.NONE_MAPPED;
} }