forked from Slimefun/Slimefun4
-
-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
# Conflicts: # .github/workflows/discord-webhook.yml # .github/workflows/maven-compiler.yml # .github/workflows/sonarcloud.yml # pom.xml # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java # src/main/java/io/github/thebusybiscuit/slimefun4/utils/WorldUtils.java
- Loading branch information
Showing
10 changed files
with
233 additions
and
89 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
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
37 changes: 37 additions & 0 deletions
37
...github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary.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,37 @@ | ||
| package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; | ||
|
|
||
| import java.util.Random; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import javax.annotation.ParametersAreNonnullByDefault; | ||
|
|
||
| import org.bukkit.Material; | ||
| import org.bukkit.inventory.ItemStack; | ||
|
|
||
| import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; | ||
|
|
||
| /** | ||
| * Simple interface to map ore blocks to their respective item(s). | ||
| * | ||
| * @author TheBusyBiscuit | ||
| * | ||
| */ | ||
| interface OreDictionary { | ||
|
|
||
| @Nonnull | ||
| @ParametersAreNonnullByDefault | ||
| ItemStack getDrops(Material material, Random random); | ||
|
|
||
| static @Nonnull OreDictionary forVersion(@Nonnull MinecraftVersion version) { | ||
| if (version.isAtLeast(MinecraftVersion.MINECRAFT_1_17)) { | ||
| // MC 1.17 - 1.18 | ||
| return new OreDictionary17(); | ||
| } else if (version.isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { | ||
| // MC 1.16 | ||
| return new OreDictionary16(); | ||
| } else { | ||
| // MC 1.14 - 1.15 | ||
| return new OreDictionary14(); | ||
| } | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
...thub/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary14.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,44 @@ | ||
| package io.github.thebusybiscuit.slimefun4.implementation.items.multiblocks.miner; | ||
|
|
||
| import java.util.Random; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import javax.annotation.ParametersAreNonnullByDefault; | ||
|
|
||
| import org.bukkit.Material; | ||
| import org.bukkit.inventory.ItemStack; | ||
|
|
||
| /** | ||
| * Our {@link OreDictionary} implementation for MC 1.14 or higher. | ||
| * | ||
| * @author TheBusyBiscuit | ||
| * | ||
| */ | ||
| class OreDictionary14 implements OreDictionary { | ||
|
|
||
| @Override | ||
| @ParametersAreNonnullByDefault | ||
| public @Nonnull ItemStack getDrops(Material material, Random random) { | ||
| switch (material) { | ||
| case COAL_ORE: | ||
| return new ItemStack(Material.COAL); | ||
| case DIAMOND_ORE: | ||
| return new ItemStack(Material.DIAMOND); | ||
| case EMERALD_ORE: | ||
| return new ItemStack(Material.EMERALD); | ||
| case REDSTONE_ORE: | ||
| return new ItemStack(Material.REDSTONE, 4 + random.nextInt(2)); | ||
| case LAPIS_ORE: | ||
| return new ItemStack(Material.LAPIS_LAZULI, 4 + random.nextInt(4)); | ||
| case NETHER_QUARTZ_ORE: | ||
| return new ItemStack(Material.QUARTZ); | ||
| case IRON_ORE: | ||
| return new ItemStack(Material.IRON_ORE); | ||
| case GOLD_ORE: | ||
| return new ItemStack(Material.GOLD_ORE); | ||
| default: | ||
| return new ItemStack(material); | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.