Skip to content

fix: Always try to find namespace for item - ItemsAdder #277

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
Thorinwasher merged 1 commit into from
Jun 16, 2026
+19 −7
Merged

fix: Always try to find namespace for item - ItemsAdder #277

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
26 changes: 19 additions & 7 deletions ...-impl/src/main/java/dev/jsinco/brewery/bukkit/integration/item/ItemsAdderIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package dev.jsinco.brewery.bukkit.integration.item;

import dev.jsinco.brewery.api.ingredient.Ingredient;
import dev.jsinco.brewery.api.util.BreweryKey;
import dev.jsinco.brewery.api.util.Logger;
import dev.jsinco.brewery.bukkit.TheBrewingProject;
import dev.jsinco.brewery.bukkit.api.ingredient.PluginIngredient;
import dev.jsinco.brewery.bukkit.api.integration.ItemIntegration;
import dev.jsinco.brewery.bukkit.util.color.ResourcePackColors;
import dev.jsinco.brewery.bukkit.util.color.ResourcePackSource;
Expand All @@ -18,7 +21,7 @@
import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;

import java.awt.Color;
import java.awt.*;
import java.io.File;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
Expand Down Expand Up @@ -55,8 +58,7 @@ public boolean isIngredient(String id) {
if (customStack == null) {
return null;
}
String id = customStack.getId();
return id.contains(":") ? id.split(":", 2)[1] : id;
return customStack.getNamespacedID();
}

@Override
Expand All @@ -81,10 +83,20 @@ public void onEnable() {

@Override
public CompletableFuture<Optional<Ingredient>> createIngredient(String id) {
if (id.contains(":")) {
id = id.split(":", 2)[1];
}
return ItemIntegration.super.createIngredient(id);
return initialized()
.handleAsync((ignored1, exception) -> {
if (exception != null) {
Logger.logErr("Couldn't create PluginIngredient '" + id + "' for item integration " + getId());
Logger.logErr(exception);
return Optional.empty();
}
CustomStack customStack = CustomStack.getInstance(id);
if (customStack == null) {
return Optional.empty();
}
return Optional.of(new PluginIngredient(new BreweryKey(getId(), customStack.getNamespacedID()), this));
}
);
}

@EventHandler
Expand Down
Loading