Skip to content

Fixing the creation of items from MMOItems #23

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

Open
Distemi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixing the creation of items from MMOItems #23

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
2 changes: 1 addition & 1 deletion plugin/src/main/java/me/dreamdevs/randomlootchest/commands/subcommands/ItemsSubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public boolean execute(CommandSender commandSender, String[] args) {
return true;
}

RandomItem randomItem = new RandomItem(player.getInventory().getItemInMainHand(), chance, false);
RandomItem randomItem = new RandomItem(() -> player.getInventory().getItemInMainHand().clone(), chance, false);
RandomLootChestMain.getInstance().getItemsManager().getItems().put(id, randomItem);
RandomLootChestMain.getInstance().getItemsManager().save();
player.sendMessage(Language.ITEMS_ADDED_ITEM.toString());
Expand Down
8 changes: 5 additions & 3 deletions plugin/src/main/java/me/dreamdevs/randomlootchest/hooks/MMOItemsHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.jetbrains.annotations.NotNull;

import java.util.Optional;
import java.util.concurrent.Callable;

public class MMOItemsHook {

Expand All @@ -18,9 +19,10 @@ public MMOItemsHook() {
Util.sendPluginMessage("&aHooked into MMOItems!");
}

public ItemStack getItemStack(@NotNull String type, @NotNull String itemId) {
public Callable<ItemStack> getItemStack(@NotNull String type, @NotNull String itemId) {
MMOItem mmoItem = MMOItems.plugin.getMMOItem(Type.get(type), itemId);
return Optional.ofNullable(mmoItem).map(mmoItem1 -> mmoItem1.newBuilder().build()).orElse(null);
if (mmoItem == null)
return () -> null;
return () -> mmoItem.newBuilder().build();
}

}
6 changes: 4 additions & 2 deletions plugin/src/main/java/me/dreamdevs/randomlootchest/hooks/MythicMobsHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import me.dreamdevs.randomlootchest.api.util.Util;
import org.bukkit.inventory.ItemStack;

import java.util.concurrent.Callable;

public class MythicMobsHook {

public static MythicMobsHook INSTANCE;
Expand All @@ -16,8 +18,8 @@ public MythicMobsHook() {
Util.sendPluginMessage("&aHooked into MythicMobs!");
}

public ItemStack getItemStack(String id) {
return mythicBukkit.getItemManager().getItemStack(id);
public Callable<ItemStack> getItemStack(String id) {
return () -> mythicBukkit.getItemManager().getItemStack(id);
}

}
8 changes: 7 additions & 1 deletion plugin/src/main/java/me/dreamdevs/randomlootchest/managers/ChestsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import java.io.File;
import java.util.*;
import java.util.concurrent.Callable;

@Getter
public class ChestsManager {
Expand Down Expand Up @@ -135,7 +136,12 @@ public void load(RandomLootChestMain plugin) {
itemStack.setItemMeta(copiedMeta);
}

RandomItem randomItem = new RandomItem(itemStack, config.getDouble(CONTENTS + "." + content + ".Chance"), config.getBoolean(CONTENTS + "." + content + ".RandomAmount", false));
ItemStack finalItemStack = itemStack;
Callable<ItemStack> callable = () -> null;
if (finalItemStack != null) {
callable = finalItemStack::clone;
}
RandomItem randomItem = new RandomItem(callable, config.getDouble(CONTENTS + "." + content + ".Chance"), config.getBoolean(CONTENTS + "." + content + ".RandomAmount", false));

chestGame.getItemStacks().add(randomItem);
} catch (NullPointerException e) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/me/dreamdevs/randomlootchest/managers/ItemsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void load(RandomLootChestMain plugin) {
itemsSection.getInt(string+".Amount",1), itemsSection.getString(string+".DisplayName"),
itemsSection.getStringList(string+".DisplayLore"), enchantments,
itemsSection.getBoolean(string+".Unbreakable", false), itemsSection.getBoolean(string+".Glowing",false));
items.put(string, new RandomItem(itemStack, section.get().getDouble(string+".Chance"), section.get().getBoolean(string+".RandomAmount", false)));
items.put(string, new RandomItem(() -> itemStack.clone(), section.get().getDouble(string+".Chance"), section.get().getBoolean(string+".RandomAmount", false)));
}));
}

Expand Down
13 changes: 10 additions & 3 deletions plugin/src/main/java/me/dreamdevs/randomlootchest/objects/RandomItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,28 @@

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;

@AllArgsConstructor
public class RandomItem implements IRandomItem {

private ItemStack itemStack;
private Callable<ItemStack> itemStack;
private double chance;
private boolean randomDropAmount;

public RandomItem(ItemStack itemStack, double chance) {
public RandomItem(Callable<ItemStack> itemStack, double chance) {
this.itemStack = itemStack;
this.chance = chance;
this.randomDropAmount = false;
}

@Override
public ItemStack getItemStack() {
return this.itemStack;
try {
return this.itemStack.call();
} catch (Exception e) {
throw new RuntimeException(e);
}
}

@Override
Expand All @@ -40,11 +45,13 @@ public void setRandomDropAmount(boolean randomDropAmount) {
}

public String getDisplayName() {
var itemStack = getItemStack();
return (itemStack.hasItemMeta() && itemStack.getItemMeta() != null && itemStack.getItemMeta().hasDisplayName())
? itemStack.getItemMeta().getDisplayName() : itemStack.getType().name();
}

public List<String> getLore() {
var itemStack = getItemStack();
return (itemStack.hasItemMeta() && itemStack.getItemMeta() != null && itemStack.getItemMeta().hasLore())
? itemStack.getItemMeta().getLore() : new ArrayList<>();
}
Expand Down