hide actions according to Action#showInSelectAction

TeamLapen · Mar 16, 2024 · 65a6083 · 65a6083
1 parent c6dea82
commit 65a6083
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/client/gui/screens/EditSelectActionScreen.java b/src/main/java/de/teamlapen/vampirism/client/gui/screens/EditSelectActionScreen.java
@@ -52,7 +52,7 @@ private static <T extends IFactionPlayer<T>> boolean isEnabled(T player, @NotNul
     }
 
     private static <T extends IFactionPlayer<T>> ItemOrdering<IAction<?>> getOrdering(T player) {
-        return new ItemOrdering<>(ClientConfigHelper.getActionOrder(player.getFaction()), new ArrayList<>(), () -> ModRegistries.ACTIONS.stream().filter(action -> action.matchesFaction(player.getFaction())).collect(Collectors.toList()));
+        return new ItemOrdering<>(ClientConfigHelper.getActionOrder(player.getFaction()).stream().filter(s -> s.showInSelectAction(player.asEntity())).toList(), new ArrayList<>(), () -> ModRegistries.ACTIONS.stream().filter(action -> action.matchesFaction(player.getFaction())).filter(s -> s.showInSelectAction(player.asEntity())).collect(Collectors.toList()));
     }
 
     private static <T extends IFactionPlayer<T>> void saveOrdering(T player, ItemOrdering<IAction<?>> ordering) {

diff --git a/src/main/java/de/teamlapen/vampirism/client/gui/screens/SelectActionRadialScreen.java b/src/main/java/de/teamlapen/vampirism/client/gui/screens/SelectActionRadialScreen.java
@@ -19,6 +19,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Player;
 
 import java.util.Collections;
 import java.util.List;
@@ -56,7 +57,8 @@ public static void show(KeyMapping keyMapping) {
     }
 
     private static RadialMenu<IAction<?>> getRadialMenu(List<IAction<?>> actions) {
-        List<IRadialMenuSlot<IAction<?>>> parts = actions.stream().map(a -> (IRadialMenuSlot<IAction<?>>)new RadialMenuSlot<IAction<?>>(a.getName(), a, Collections.emptyList())).toList();
+        Player player = Minecraft.getInstance().player;
+        List<IRadialMenuSlot<IAction<?>>> parts = actions.stream().filter(s -> s.showInSelectAction(player)).map(a -> (IRadialMenuSlot<IAction<?>>)new RadialMenuSlot<IAction<?>>(a.getName(), a, Collections.emptyList())).toList();
         return new RadialMenu<>((i) -> {
             VampirismMod.proxy.sendToServer(ServerboundToggleActionPacket.createFromRaytrace(RegUtil.id(parts.get(i).primarySlotIcon()), Minecraft.getInstance().hitResult));
         }, parts , SelectActionRadialScreen::drawActionPart,0);