Skip to content

Commit

Permalink
Fix client command registration for Fabric
Browse files Browse the repository at this point in the history
The dispatcher is not actually available during mod init. So,
use the event callback.
  • Loading branch information
Spottedleaf committed Aug 11, 2024
1 parent c577819 commit c0a2e48
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
import ca.spottedleaf.moonrise.patches.command.MoonriseCommand;
import com.mojang.brigadier.CommandDispatcher;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
import net.minecraft.commands.CommandBuildContext;

public final class MoonriseFabricClient implements ClientModInitializer {

@SuppressWarnings({"rawtypes", "unchecked"})
@Override
public void onInitializeClient() {
MoonriseCommand.registerClient((CommandDispatcher) ClientCommandManager.getActiveDispatcher());
ClientCommandRegistrationCallback.EVENT.register((final CommandDispatcher<FabricClientCommandSource> commandDispatcher, final CommandBuildContext commandBuildContext) -> {
MoonriseCommand.registerClient((CommandDispatcher)commandDispatcher);
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.commands.CommandBuildContext;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.util.Mth;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;

public final class LeafProfiler {

Expand Down Expand Up @@ -41,7 +42,9 @@ public LeafProfiler(final LProfilerRegistry registry, final LProfileGraph graph)
}

private static void add(final long[] dst, final long[] src) {
for (int i = 0; i < src.length; ++i) {
final int srcLen = src.length;
Objects.checkFromToIndex(0, srcLen, dst.length);
for (int i = 0; i < srcLen; ++i) {
dst[i] += src[i];
}
}
Expand Down

0 comments on commit c0a2e48

Please sign in to comment.