Repo-Mirror/Custom-Crops
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Crops.git synced 2025-12-28 03:19:15 +00:00
Code Issues Releases Activity

Change method signature

Browse Source
This commit is contained in:
XiaoMoMi
2024-09-06 03:44:10 +08:00
parent da10511b47
commit 6e25b3f6b7
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionQualityCrops.java
View File

@@ -39,6 +39,7 @@ import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import static java.util.Objects.requireNonNull;
@@ -77,14 +78,20 @@ public class ActionQualityCrops<T> extends AbstractBuiltInAction<T> {
if (context.holder() instanceof Player p) {
player = p;
}
generateItem(location, player, random);
for (ItemStack itemStack : generateItem(location, player, random)) {
if (toInv && player != null) {
PlayerUtils.giveItem(player, itemStack, itemStack.getAmount());
} else {
location.getWorld().dropItemNaturally(location, itemStack);
}
}
}
public void generateItem(Location location, @Nullable Player player, int randomAmount) {
public List<ItemStack> generateItem(Location location, @Nullable Player player, int randomAmount) {
double[] ratio = ConfigManager.defaultQualityRatio();
Optional<CustomCropsWorld<?>> world = plugin.getWorldManager().getWorld(location.getWorld());
if (world.isEmpty()) {
return;
return List.of();
}
Pos3 pos3 = Pos3.from(location);
Fertilizer[] fertilizers = null;
@@ -111,22 +118,20 @@ public class ActionQualityCrops<T> extends AbstractBuiltInAction<T> {
ratio = newRatio;
}
}
ArrayList<ItemStack> droppedItems = new ArrayList<>();
outer:
for (int i = 0; i < randomAmount; i++) {
double r1 = Math.random();
for (int j = 0; j < ratio.length; j++) {
if (r1 < ratio[j]) {
ItemStack drop = plugin.getItemManager().build(player, qualityLoots[j]);
if (drop == null || drop.getType() == Material.AIR) continue;
if (toInv && player != null) {
PlayerUtils.giveItem(player, drop, 1);
} else {
location.getWorld().dropItemNaturally(location, drop);
}
continue outer;
}
for (int i = 0; i < randomAmount; i++) {
double r1 = Math.random();
for (int j = 0; j < ratio.length; j++) {
if (r1 < ratio[j]) {
ItemStack drop = plugin.getItemManager().build(player, qualityLoots[j]);
if (drop == null || drop.getType() == Material.AIR) continue;
droppedItems.add(drop);
continue outer;
}
}
}
return droppedItems;
}
public MathValue<T> min() {