Skip to content

chore: temporarily back out neo key category changes #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
desht merged 1 commit into from
May 11, 2026
Merged

chore: temporarily back out neo key category changes #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions ...src/main/java/dev/ftb/mods/ftblibrary/neoforge/platform/client/NeoPlatformClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
import org.jspecify.annotations.NonNull;

import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

public class NeoPlatformClientImpl implements PlatformClient {
private final Set<KeyMapping.Category> registeredCategories = ConcurrentHashMap.newKeySet();

@Override
public void sendToServer(CustomPacketPayload payload) {
ClientPacketDistributor.sendToServer(payload);
Expand All @@ -33,23 +31,18 @@ public void addResourcePackReloadListeners(String modId, Map<Identifier, Prepara

@Override
public KeyMapping.Category registerKeyMappingCategory(Identifier id) {
var category = new KeyMapping.Category(id);
if (!registeredCategories.add(category)) {
throw new IllegalStateException("Key mapping category " + id + " is already registered");
}

return category;
return new KeyMapping.Category(id); // TODO temporary - rework for 26.1.2.4
}

@Override
public void registerKeyMapping(String modId, KeyMapping... keyMappings) {
getModBusOrThrow(modId).addListener(RegisterKeyMappingsEvent.class, event -> {
Set<KeyMapping.Category> cats = new HashSet<>();
for (var k : keyMappings) {
cats.add(k.getCategory());
event.register(k);
}

registeredCategories.forEach(event::registerCategory);
registeredCategories.clear();
cats.forEach(event::registerCategory);
});
}

Expand Down
Loading