diff --git a/CHANGELOG.md b/CHANGELOG.md index be5acc363..eb1175c95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ **Table of contents** -- [Release Candidate 19 (TBD)](#release-candidate-19-tbd) +- [Release Candidate 19 (11 Jan 2021)](#release-candidate-19-11-jan-2021) - [Release Candidate 18 (03 Dec 2020)](#release-candidate-18-03-dec-2020) - [Release Candidate 17 (17 Oct 2020)](#release-candidate-17-17-oct-2020) - [Release Candidate 16 (07 Sep 2020)](#release-candidate-16-07-sep-2020) @@ -24,7 +24,7 @@ -## Release Candidate 19 (TBD) +## Release Candidate 19 (11 Jan 2021) #### Additions * Added Bee Armor (1.15+ only) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java index 45c2ea829..44948ab4b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java @@ -1,6 +1,5 @@ package io.github.thebusybiscuit.slimefun4.implementation.items.androids; -import java.util.Optional; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; @@ -12,11 +11,9 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.data.Ageable; import org.bukkit.block.data.BlockData; -import org.bukkit.event.EventHandler; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.slimefun4.api.events.AndroidFarmEvent; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; @@ -49,8 +46,6 @@ public class FarmerAndroid extends ProgrammableAndroid { AndroidFarmEvent event = new AndroidFarmEvent(block, instance, isAdvanced, drop); Bukkit.getPluginManager().callEvent(event); - handleExoticGarden(event); - if (!event.isCancelled()) { drop = event.getDrop(); @@ -65,24 +60,6 @@ public class FarmerAndroid extends ProgrammableAndroid { } } - /** - * Deprecated method. - * - * @deprecated This will be moved into an {@link EventHandler} inside exoticgarden itself on the next update. - * - * @param event - * the event - * @param isAdvanced - * is advanced - */ - @Deprecated - private void handleExoticGarden(AndroidFarmEvent event) { - if (event.isAdvanced() && SlimefunPlugin.getIntegrations().isExoticGardenInstalled()) { - Optional result = SlimefunPlugin.getThirdPartySupportService().harvestExoticGardenPlant(event.getBlock()); - result.ifPresent(event::setDrop); - } - } - private ItemStack getDropFromCrop(Material crop) { Random random = ThreadLocalRandom.current();