Skip to content

Register View events properly #692

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
ItzKatze merged 1 commit into from
Jan 18, 2026
Merged

Register View events properly #692

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions type.generic/src/main/java/net/swofty/type/generic/HypixelGenericLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public void initialize(MinecraftServer server) {
loader.getTraditionalEvents().forEach(HypixelEventHandler::registerEventMethods);
loader.getCustomEvents().forEach(HypixelEventHandler::registerEventMethods);
loopThroughPackage("net.swofty.type.generic.event.actions", HypixelEventClass.class).forEach(HypixelEventHandler::registerEventMethods);
loopThroughPackage("net.swofty.type.generic.gui.v2.event", HypixelEventClass.class).forEach(HypixelEventHandler::registerEventMethods);
// SkyBlockGenericLoader always runs after the generic loader, so if we are a SkyBlock server,
// we will let that loader register the events
if (!loader.getType().isSkyBlock()) {
Expand Down
8 changes: 6 additions & 2 deletions type.generic/src/main/java/net/swofty/type/generic/gui/v2/event/ActionInventoryOpen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.swofty.type.generic.gui.v2.event;

import net.minestom.server.MinecraftServer;
import net.minestom.server.event.inventory.InventoryOpenEvent;
import net.swofty.type.generic.event.EventNodes;
import net.swofty.type.generic.event.HypixelEvent;
Expand All @@ -11,8 +12,11 @@ public class ActionInventoryOpen implements HypixelEventClass {

@HypixelEvent(node = EventNodes.INVENTORY, requireDataLoaded = false)
public void onPlayerInventoryOpen(InventoryOpenEvent event) {
HypixelPlayer player = (HypixelPlayer) event.getPlayer();
ViewNavigator.find(player).ifPresent(navigator -> navigator.getCurrentSession().onOpenEvent(event));
MinecraftServer.getSchedulerManager().scheduleNextTick(() -> {
HypixelPlayer player = (HypixelPlayer) event.getPlayer();
ViewNavigator.find(player).ifPresent(navigator -> navigator.getCurrentSession().onOpenEvent(event));
});

}

}
11 changes: 3 additions & 8 deletions ...ric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUICrafting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,7 @@ public void layout(ViewLayout<CraftingState> layout, CraftingState state, ViewCo
Components.containerGrid(
layout,
10,
30, (slot, oldItem, newItem, state1) -> {
Logger.info("Container grid changed at slot " + slot);
Logger.info("Old Item: " + oldItem);
Logger.info("New Item: " + newItem);
30, (_, _, _, state1) -> {
int newHash = computeGridHash(ctx);
SkyBlockRecipe<?> newRecipe = SkyBlockRecipe.parseRecipe(getCurrentRecipeStacks(ctx));
if (state1.lastGridHash() == newHash && Objects.equals(state1.lastParsedRecipe(), newRecipe)) {
Expand All @@ -83,11 +80,9 @@ public void layout(ViewLayout<CraftingState> layout, CraftingState state, ViewCo
Arrays.copyOfRange(result.errorMessage(), 1, result.errorMessage().length)));
} else {
int amount = recipe.getAmount();
SkyBlockRecipe<?> finalRecipe = recipe;

layout.slot(RESULT_SLOT, (s, c) -> {
SkyBlockPlayer p = (SkyBlockPlayer) c.player();
ItemStack.Builder builder = PlayerItemUpdater.playerUpdate(p, finalRecipe.getResult().getItemStack()).amount(amount);
ItemStack.Builder builder = PlayerItemUpdater.playerUpdate(p, recipe.getResult().getItemStack()).amount(amount);

ArrayList<String> lore = new ArrayList<>();
var existingLore = builder.build().get(DataComponents.LORE);
Expand All @@ -100,7 +95,7 @@ public void layout(ViewLayout<CraftingState> layout, CraftingState state, ViewCo
.collect(Collectors.toList()));

return builder;
}, (click, c) -> handleCraft(click, c, finalRecipe, amount));
}, (click, c) -> handleCraft(click, c, recipe, amount));
}
}

Expand Down