Skip to content

Commit 80c861e

Browse files
committed
Fix component lookup flipping X and Z in map
1 parent c22023b commit 80c861e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/java/dev/compactmods/crafting/recipes/blocks/ComponentPositionLookupCodec.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package dev.compactmods.crafting.recipes.blocks;
22

3-
import java.util.ArrayList;
3+
import java.util.Arrays;
44
import java.util.List;
5+
import java.util.stream.Collectors;
56
import com.google.common.collect.ImmutableList;
67
import com.mojang.datafixers.util.Pair;
78
import com.mojang.serialization.Codec;
@@ -12,6 +13,7 @@
1213
import dev.compactmods.crafting.recipes.RecipeHelper;
1314
import dev.compactmods.crafting.util.BlockSpaceUtil;
1415
import net.minecraft.util.math.AxisAlignedBB;
16+
import net.minecraft.util.math.BlockPos;
1517

1618
public class ComponentPositionLookupCodec implements PrimitiveCodec<ComponentPositionLookup> {
1719
@Override
@@ -50,13 +52,11 @@ public <T> T write(DynamicOps<T> ops, ComponentPositionLookup lookup) {
5052
BlockSpaceUtil.getBlocksIn(boundsForBlocks)
5153
.map(pos -> Pair.of(pos.immutable(), lookup.getRequiredComponentKeyForPosition(pos).orElse("-")))
5254
.forEach(pair -> {
53-
map[pair.getFirst().getZ()][pair.getFirst().getX()] = pair.getSecond();
55+
final BlockPos p = pair.getFirst();
56+
map[p.getX()][p.getZ()] = pair.getSecond();
5457
});
5558

56-
List<List<String>> fin = new ArrayList<>(map.length);
57-
for(int x = 0; x < boundsForBlocks.getXsize(); x++) {
58-
fin.add(ImmutableList.copyOf(map[x]));
59-
}
59+
List<List<String>> fin = Arrays.stream(map).map(ImmutableList::copyOf).collect(Collectors.toList());
6060

6161
DataResult<T> encoded = Codec.STRING.listOf().listOf().encode(fin, ops, ops.empty());
6262

0 commit comments

Comments
 (0)