cmap #472
cmap #472
Conversation
src/main/java/net/earthcomputer/clientcommands/command/MapCommand.java
Outdated
Show resolved
Hide resolved
src/main/java/net/earthcomputer/clientcommands/command/MapCommand.java
Outdated
Show resolved
Hide resolved
src/main/java/net/earthcomputer/clientcommands/command/MapCommand.java
Outdated
Show resolved
Hide resolved
src/main/java/net/earthcomputer/clientcommands/command/MapCommand.java
Outdated
Show resolved
Hide resolved
src/main/java/net/earthcomputer/clientcommands/command/MapCommand.java
Outdated
Show resolved
Hide resolved
|
I still like @haykam821's suggestion of extending the functionality of this command to maps you are looking at. Should I open a separate issue for that? |
|
he can pr that xd |
|
that was much harder than expected but it works |
wagyourtail
requested review from
xpple,
Earthcomputer and
haykam821
and removed request for
Earthcomputer and
xpple
|
wait, since when can I not request multiple reviews |
src/main/java/net/earthcomputer/clientcommands/command/MapCommand.java
Outdated
Show resolved
Hide resolved
| int width = mapInfo[0].length * 128 * upscale; | ||
| int height = mapInfo.length * 128 * upscale; |
There was a problem hiding this comment.
Could 128 be replaced with size constants? These constants could be initialized to FilledMapItem.field_30907 and FilledMapItem.field_30908.
There was a problem hiding this comment.
which one is which
There was a problem hiding this comment.
I'd assume FilledMapItem.field_30907 is width and FilledMapItem.field_30908 is height.
| import static com.mojang.brigadier.arguments.IntegerArgumentType.getInteger; | ||
| import static com.mojang.brigadier.arguments.IntegerArgumentType.integer; | ||
| import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; | ||
| import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; |
There was a problem hiding this comment.
I believe your latest commit may have turned these back into non-wildcard imports again.
| dispatcher.register(literal("cmap") | ||
| .then(literal("export") | ||
| .executes(ctx -> exportMap(ctx.getSource(), 1)) | ||
| .then(argument("upscale", integer(1, 16)) | ||
| .executes(ctx -> exportMap(ctx.getSource(), getInteger(ctx, "upscale"))) | ||
| ) | ||
| ) | ||
| ); |
There was a problem hiding this comment.
It has become convention to not put the closing parentheses on a newline.
| int y = vec.getComponentAlongAxis(yAxis.getAxis()) * yAxis.getDirection().offset(); | ||
| int x = vec.getComponentAlongAxis(xAxis.getAxis()) * xAxis.getDirection().offset(); | ||
| // this should never be possible | ||
| if (flattened.put(new Vec2i(x, y), next) != null) throw new IllegalStateException("Duplicate item frame at " + nextPos); |
| public int width() { | ||
| if (rotation % 2 == 0) { | ||
| return FilledMapItem.field_30907; | ||
| } else { | ||
| return FilledMapItem.field_30908; | ||
| } | ||
| } | ||
|
|
||
| public int height() { | ||
| if (rotation % 2 == 0) { | ||
| return FilledMapItem.field_30908; | ||
| } else { | ||
| return FilledMapItem.field_30907; | ||
| } | ||
| } |
| private record Vec2i(int x, int z) { | ||
|
|
||
| } |
There was a problem hiding this comment.
JOML already provides a Vector2i.
save held map to file