From f727ab578158904440ade9aacb0ad8ac58ddd255 Mon Sep 17 00:00:00 2001 From: HyCraftHD Date: Fri, 28 Jul 2023 00:46:25 +0200 Subject: [PATCH] Fix holder class name in common module for key mapping --- .../impl/common/CommonKeyMappingRegister.java | 10 +++++----- .../u_team_core/impl/FabricKeyMappingRegister.java | 4 ++-- .../u_team_core/impl/ForgeKeyMappingRegister.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/src/common/java/info/u_team/u_team_core/impl/common/CommonKeyMappingRegister.java b/common/src/common/java/info/u_team/u_team_core/impl/common/CommonKeyMappingRegister.java index 98db142e9..e28be5418 100644 --- a/common/src/common/java/info/u_team/u_team_core/impl/common/CommonKeyMappingRegister.java +++ b/common/src/common/java/info/u_team/u_team_core/impl/common/CommonKeyMappingRegister.java @@ -11,7 +11,7 @@ public abstract class CommonKeyMappingRegister implements KeyMappingRegister { - protected final Map> entries; + protected final Map> entries; protected CommonKeyMappingRegister() { entries = new LinkedHashMap<>(); @@ -19,20 +19,20 @@ protected CommonKeyMappingRegister() { @Override public LazyEntry register(Supplier supplier) { - final ForgeKeyMappingSimpleEntry entry = new ForgeKeyMappingSimpleEntry(); + final KeyMappingLazyEntry entry = new KeyMappingLazyEntry(); entries.put(entry, supplier); return entry; } - protected void updateReference(ForgeKeyMappingSimpleEntry entry, KeyMapping key) { + protected void updateReference(KeyMappingLazyEntry entry, KeyMapping key) { entry.updateReference(key); } - public static class ForgeKeyMappingSimpleEntry implements LazyEntry { + public static class KeyMappingLazyEntry implements LazyEntry { private KeyMapping value; - ForgeKeyMappingSimpleEntry() { + KeyMappingLazyEntry() { } void updateReference(KeyMapping key) { diff --git a/fabric/src/main/java/info/u_team/u_team_core/impl/FabricKeyMappingRegister.java b/fabric/src/main/java/info/u_team/u_team_core/impl/FabricKeyMappingRegister.java index 19c5a7a3a..286b03ee2 100644 --- a/fabric/src/main/java/info/u_team/u_team_core/impl/FabricKeyMappingRegister.java +++ b/fabric/src/main/java/info/u_team/u_team_core/impl/FabricKeyMappingRegister.java @@ -15,8 +15,8 @@ public class FabricKeyMappingRegister extends CommonKeyMappingRegister { @Override public void register() { - for (final Entry> entry : entries.entrySet()) { - final ForgeKeyMappingSimpleEntry registryEntry = entry.getKey(); + for (final Entry> entry : entries.entrySet()) { + final KeyMappingLazyEntry registryEntry = entry.getKey(); final KeyMapping keyMapping = entry.getValue().get(); KeyBindingHelper.registerKeyBinding(keyMapping); updateReference(registryEntry, keyMapping); diff --git a/forge/src/main/java/info/u_team/u_team_core/impl/ForgeKeyMappingRegister.java b/forge/src/main/java/info/u_team/u_team_core/impl/ForgeKeyMappingRegister.java index be81e062e..17f332f48 100644 --- a/forge/src/main/java/info/u_team/u_team_core/impl/ForgeKeyMappingRegister.java +++ b/forge/src/main/java/info/u_team/u_team_core/impl/ForgeKeyMappingRegister.java @@ -20,8 +20,8 @@ public void register() { } private void registerKeyMapping(RegisterKeyMappingsEvent event) { - for (final Entry> entry : entries.entrySet()) { - final ForgeKeyMappingSimpleEntry registryEntry = entry.getKey(); + for (final Entry> entry : entries.entrySet()) { + final KeyMappingLazyEntry registryEntry = entry.getKey(); final KeyMapping keyMapping = entry.getValue().get(); event.register(keyMapping); updateReference(registryEntry, keyMapping);