-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from Th3Shadowbroker/feature/drops
Feature/drops
- Loading branch information
Showing
15 changed files
with
539 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
src/main/java/dev/th3shadowbroker/ouroboros/mines/drops/Drop.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Copyright 2020 Jens Fischer | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the | ||
| * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to | ||
| * permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all copies or substantial portions of | ||
| * the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING | ||
| * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY | ||
| * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
| * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package dev.th3shadowbroker.ouroboros.mines.drops; | ||
|
|
||
| import dev.th3shadowbroker.ouroboros.mines.util.Range; | ||
| import org.bukkit.configuration.ConfigurationSection; | ||
| import org.bukkit.inventory.ItemStack; | ||
|
|
||
| public class Drop { | ||
|
|
||
| private final ItemStack itemStack; | ||
|
|
||
| private final double dropChance; | ||
|
|
||
| private final Range dropAmount; | ||
|
|
||
| public Drop(ItemStack itemStack, double dropChance, Range dropAmount) { | ||
| this.itemStack = itemStack; | ||
| this.dropChance = dropChance; | ||
| this.dropAmount = dropAmount; | ||
| } | ||
|
|
||
| public ItemStack getItemStack() { | ||
| return itemStack; | ||
| } | ||
|
|
||
| public double getDropChance() { | ||
| return dropChance; | ||
| } | ||
|
|
||
| public Range getDropAmount() { | ||
| return dropAmount; | ||
| } | ||
|
|
||
| public ItemStack drawDropstack() { | ||
| ItemStack dropStack = itemStack.clone(); | ||
| dropStack.setAmount(dropAmount.isRange() ? dropAmount.getRandomWithin() : dropAmount.getMin()); | ||
| return dropStack; | ||
| } | ||
|
|
||
| public static Drop fromSection(ConfigurationSection section) { | ||
| ItemStack itemStack = section.getItemStack("item"); | ||
| double dropChance = section.getDouble("chance", 1); | ||
| Range dropAmount = Range.fromString(section.getString("amount", "1")); | ||
| return new Drop(itemStack, dropChance, dropAmount); | ||
| } | ||
|
|
||
| } |
99 changes: 99 additions & 0 deletions
99
src/main/java/dev/th3shadowbroker/ouroboros/mines/drops/DropGroup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Copyright 2020 Jens Fischer | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the | ||
| * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to | ||
| * permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all copies or substantial portions of | ||
| * the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING | ||
| * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY | ||
| * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
| * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package dev.th3shadowbroker.ouroboros.mines.drops; | ||
|
|
||
| import org.bukkit.inventory.ItemStack; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Random; | ||
|
|
||
| public class DropGroup { | ||
|
|
||
| private final List<Drop> drops; | ||
|
|
||
| private final boolean multidrop; | ||
|
|
||
| public DropGroup(List<Drop> drops, boolean multidrop) { | ||
| this.drops = drops; | ||
| this.multidrop = multidrop; | ||
| } | ||
|
|
||
| public boolean isValid() { | ||
| return multidrop || drops.stream().mapToDouble(Drop::getDropChance).sum() <= 1; | ||
| } | ||
|
|
||
| public List<Drop> getDrops() { | ||
| return drops; | ||
| } | ||
|
|
||
| public boolean isMultidrop() { | ||
| return multidrop; | ||
| } | ||
|
|
||
| private ItemStack[] drawMultidrop() { | ||
| final List<ItemStack> drops = new ArrayList<>(); | ||
| this.drops.forEach( | ||
| drop -> { | ||
|
|
||
| // Drop chance 100 or higher | ||
| if (drop.getDropChance() >= 1) { | ||
| drops.add(drop.drawDropstack()); | ||
|
|
||
| // Drop chance below 100 | ||
| } else { | ||
| Random rnd = new Random(); | ||
| boolean shallDrop = ((double) rnd.nextInt(100) / 100) <= drop.getDropChance(); | ||
| if (shallDrop) { | ||
| drops.add(drop.drawDropstack()); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| ); | ||
| return drops.stream().toArray(ItemStack[]::new); | ||
| } | ||
|
|
||
| private ItemStack[] drawSingledrop() { | ||
| ItemStack dropStack = null; | ||
| Random rnd = new Random(); | ||
|
|
||
| double drawnChance = ((double) rnd.nextInt(100) / 100); | ||
| double offset = 0; | ||
|
|
||
| for (Drop drop : drops) { | ||
| boolean shallDrop = drawnChance <= drop.getDropChance() + offset; | ||
|
|
||
| if (shallDrop) { | ||
| dropStack = drop.drawDropstack(); | ||
| break; | ||
| } else { | ||
| offset += drop.getDropChance(); | ||
| } | ||
| } | ||
|
|
||
| return dropStack == null ? new ItemStack[0] : new ItemStack[]{ dropStack }; | ||
| } | ||
|
|
||
| public ItemStack[] drawDrops() { | ||
| return multidrop ? drawMultidrop() : drawSingledrop(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.