Added /slimefun drop command #2515

NCBPFluffyBear · 2020-10-28T19:59:46Z

Description

Adds /sf drop, a command which drops a Slimefun item with a selectable quantity at the specified coordinates. This is helpful for scripted actions, such as mob drops.

Changes

Added the DropCommand subcommand and registered under subcommands
Added drop-item to messages_en.yml
Added DropCommandTest unit test

Related Issues

This was suggested on Discord so that MythicMobs could drop Slimefun items

Checklist

I have fully tested the proposed changes and promise that they will not break everything into chaos.
I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them.
I followed the existing code standards and didn't mess up the formatting.
I did my best to add documentation to any public classes or methods I added.
I have added Nonnull and Nullable annotations to my methods to indicate their behaviour for null values
I added sufficient Unit Tests to cover my code.

svr333

Two really minor remarks.
This doesnt have too many usecases but it can be really damn useful in certain areas.

src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/commands/DropCommandTest.java

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java

src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/commands/DropCommandTest.java

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java

…f-drop � Conflicts: � src/main/resources/languages/messages_en.yml

…f-drop

# Conflicts: # src/main/resources/languages/messages_en.yml

WalshyDev · 2020-12-16T11:38:03Z

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunTabCompleter.java

+import com.google.common.base.Functions;
+import com.google.common.collect.Lists;


These are not used, remove

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java

WalshyDev · 2020-12-16T11:40:03Z

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java

+
+            if (amount > 0) {
+                Bukkit.getWorld(world).dropItem(new Location(Bukkit.getWorld(world), Integer.parseInt(x), Integer.parseInt(y), Integer.parseInt(z)), new CustomItem(sfItem.getItem(), amount));
+                SlimefunPlugin.getLocalization().sendMessage(sender, "messages.drop-item", true, msg -> msg.replace(PLACEHOLDER_WORLD, args[1]).replace(PLACEHOLDER_X, args[2]).replace(PLACEHOLDER_Y, args[3]).replace(PLACEHOLDER_Z, args[4]).replace(PLACEHOLDER_ITEM, sfItem.getItemName()).replace(PLACEHOLDER_AMOUNT, String.valueOf(amount)));


This line is huge, please format nicely

WalshyDev · 2020-12-16T11:40:50Z

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java

+            int amount = parseAmount(args);
+
+            if (amount > 0) {
+                Bukkit.getWorld(world).dropItem(new Location(Bukkit.getWorld(world), Integer.parseInt(x), Integer.parseInt(y), Integer.parseInt(z)), new CustomItem(sfItem.getItem(), amount));


There should be checks here or above that these are actually ints. PatternUtils.NUMERIC.matcher(s).matches()

WalshyDev · 2020-12-16T11:41:40Z

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java

+        }
+    }
+
+    private int parseAmount(String[] args) {


not sure why you pass an array here. Just pass a single string, can even use this for the x,y,z above.

WalshyDev · 2020-12-16T11:43:03Z

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java

+        int amount = 1;
+
+        if (args.length == 7) {
+            if (PatternUtils.NUMERIC.matcher(args[6]).matches()) {
+                amount = Integer.parseInt(args[6]);
+            } else {
+                return 0;
+            }
+        }
+
+        return amount;


Suggested change

int amount = 1;

if (args.length == 7) {

if (PatternUtils.NUMERIC.matcher(args[6]).matches()) {

amount = Integer.parseInt(args[6]);

} else {

return 0;

}

}

return amount;

if (PatternUtils.NUMERIC.matcher(s).matches()) {

return OptionalInt.of(Integer.parseInt(s));

} else {

return OptionalInt.empty();

}

WalshyDev · 2020-12-16T11:43:14Z

src/main/resources/languages/messages_en.yml

@@ -132,7 +134,6 @@ messages:
  no-tome-yourself: '&cYou cannot use the &4Tome of Knowledge &con yourself...'
  multimeter: '&bStored Energy: &3%stored% &b/ &3%capacity%'
  piglin-barter: '&4You cannot barter with piglins using Slimefun items'
-  bee-suit-slow-fall: '&eYour Bee Wings will help you to get back to the ground safe and slow'


don't remove this

WalshyDev · 2020-12-16T11:44:06Z

src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/commands/DropCommandTest.java

+        server.executeConsole("slimefun", "drop", "testworld", "0", "0", "0", "DROP_COMMAND_TEST_ITEM", "1");
+        for (Entity en : server.getWorld("testworld").getEntities()) {
+            Assertions.assertEquals(SlimefunItem.getByItem(((Item) en).getItemStack()), TEST_ITEM.getItem());
+        }


There also should be tests to make sure validation works, so non-extistent world, invalid coords, invalid item, too high amount/0, etc

TheBusyBiscuit · 2021-01-25T20:13:42Z

Closing this since there hasn't been a response in over a month now.

NCBPFluffyBear added 2 commits October 28, 2020 13:27

Added drop command

dcf7cc7

Added unit test

af1f47e

NCBPFluffyBear requested a review from a team as a code owner October 28, 2020 19:59

Docs

dac01ac

svr333 reviewed Oct 29, 2020

View reviewed changes

src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/commands/DropCommandTest.java Show resolved Hide resolved

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java Outdated Show resolved Hide resolved

TheBusyBot added the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Oct 31, 2020

Merge branch 'master' into sf-drop

ba6006d

poma123 removed the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Oct 31, 2020

poma123 requested changes Oct 31, 2020

View reviewed changes

poma123 assigned poma123 and svr333 Oct 31, 2020

J3fftw1 reviewed Oct 31, 2020

View reviewed changes

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/DropCommand.java Show resolved Hide resolved

Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into s…

62dcf19

…f-drop � Conflicts: � src/main/resources/languages/messages_en.yml

TheBusyBiscuit added the ⏰ Waiting for response We are waiting for a response. label Dec 10, 2020

NCBPFluffyBear added 3 commits December 15, 2020 18:23

Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into s…

cbcd67f

…f-drop

Did changes

cec3de2

Merge remote-tracking branch 'origin/sf-drop' into sf-drop

523290c

# Conflicts: # src/main/resources/languages/messages_en.yml

WalshyDev requested changes Dec 16, 2020

View reviewed changes

TheBusyBiscuit assigned WalshyDev Dec 17, 2020

TheBusyBiscuit added the 🎈 Feature This Pull Request adds a new feature. label Jan 24, 2021

TheBusyBiscuit closed this Jan 25, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added /slimefun drop command #2515

Added /slimefun drop command #2515

NCBPFluffyBear commented Oct 28, 2020 •

edited

Loading

svr333 left a comment

WalshyDev Dec 16, 2020

WalshyDev Dec 16, 2020

WalshyDev Dec 16, 2020

WalshyDev Dec 16, 2020

WalshyDev Dec 16, 2020

WalshyDev Dec 16, 2020

WalshyDev Dec 16, 2020

TheBusyBiscuit commented Jan 25, 2021

		import com.google.common.base.Functions;
		import com.google.common.collect.Lists;

Added /slimefun drop command #2515

Added /slimefun drop command #2515

Conversation

NCBPFluffyBear commented Oct 28, 2020 • edited Loading

Description

Changes

Related Issues

Checklist

svr333 left a comment

Choose a reason for hiding this comment

WalshyDev Dec 16, 2020

Choose a reason for hiding this comment

WalshyDev Dec 16, 2020

Choose a reason for hiding this comment

WalshyDev Dec 16, 2020

Choose a reason for hiding this comment

WalshyDev Dec 16, 2020

Choose a reason for hiding this comment

WalshyDev Dec 16, 2020

Choose a reason for hiding this comment

WalshyDev Dec 16, 2020

Choose a reason for hiding this comment

WalshyDev Dec 16, 2020

Choose a reason for hiding this comment

TheBusyBiscuit commented Jan 25, 2021

NCBPFluffyBear commented Oct 28, 2020 •

edited

Loading