[Update] Add new Features & Fixes (see desc) #4

JustAHuman-xD · 2024-02-16T04:54:49Z

This PR does a LARGE amount of things, I will do my best to cover them all here.

To Do

Update the Readme (I need yall's feedback cause idk how to format it with the flags system)
More extensive testing? (I've done quite a lot but maybe I should do more)

Changes (Small ones)

Refactored the main class
- Jeff wanted me to clean up this class so I delegated most of the things to relevant classes
- Just makes it cleaner and such
Added a Selection wand
- Added Items where any slimefun items can be registered on Items#init, currently only used for the wand
- The wand and the item group are hidden
- obtainable with /wesf wand
- Added WandListener used to detect when a player uses the wand
Added PositionManager
- this class was added in the refactor of the main class
- just tracks players and their stored positions
Added Utils
- Also added in the refactor of the main class
- Just has misc things used in the plugin

Command Changes

There was some major changes made here

WorldEditSlimefunCommands Changes

New annotations
- Added a suppressor for unused warnings (because of how commands work)
- Added the @CommandPermission("wesf.admin") annotation, as it will automatically apply to all commands instead of manually adding to each subcommand
Added WorldEditSlimefunCommands#init
- Registers any completions, contexts, and commands to ACF
Added a wand sub command
Refactored to use the new PositionManager
Added WorldEditSlimefunCommands#loopThroughSelection
- This method is used to reduce duplicated code, it loops through the selection and calls the runnable provided
- updated the paste and clear command to use this method
Slightly tweaked clear command parameters
- default callEvent to false
- instead of registering a completion for booleans just supply true and false directly
Largely tweaked the paste command
- added some more warnings when invalid pastes are attempted
- added command flags (see next section)
- clear any blockstorage on the blocks being pasted (fixes some weird behavior)

CommandFlags

At the request of Jeff I have made a Command flag system, this is modular and can be easily updated in the future to add more features

Added CommandFlag this abstract class accepts a type parameter for its value, ie, EnergyFlag stores a boolean, true to add, false to not
Added CommandFlags this class stores all actual flags & is the "brains" behind most of the operation
- Any CommandFlag implementations are stored in the FLAG_TYPES map, where the flag is mapped to the default instance of a flag
- Currently the 5 types are "--energy", "--inputs", "--refill_inputs_task", "--void_outputs_task", and "--timeout"
Added a command completion "@command_flags" this completion is responsible for displaying the flags and helping complete the values for the player in the command line

Other

if you have any specific questions about implementation lmk

J3fftw1

idk if i like the mess in the main class now.
but i also dont want to be a burden in this pr

src/main/java/dev/j3fftw/worldeditslimefun/commands/WorldEditSlimefunCommands.java

src/main/java/dev/j3fftw/worldeditslimefun/slimefun/Items.java

src/main/java/dev/j3fftw/worldeditslimefun/slimefun/WandListener.java

JustAHuman-xD · 2024-02-16T17:14:07Z

idk if i like the mess in the main class now.

but i also dont want to be a burden in this pr

Nah you're good, I can move stuff around

JustAHuman-xD · 2024-02-16T17:14:12Z

Clean it up

README.md

J3fftw1 · 2024-02-16T19:43:53Z

can we change the commands to bee --energy and --inputslots
so in the future we can have --scripts for android
--text for holograms etc etc

JustAHuman-xD · 2024-03-05T04:55:30Z

One thing worth noting is that I'd like to abstract this command flags system at some point, not sure how or to what but I could see it being useful in other projects

J3fftw1

quick review.
Need to do a proper review later.

README.md

J3fftw1 · 2024-03-05T08:19:27Z

src/main/java/dev/j3fftw/worldeditslimefun/commands/WorldEditSlimefunCommands.java

+
+            if (args.isEmpty()) {
+                return availableFlags;
+            }
+
+            String currentArg = args.remove(args.size() - 1);
+            if (args.isEmpty()) {
+                return availableFlags;
+            }


why do we return the same thing twice?
we both check the same thing here
should line 61 maybe be currentArg.isEmpty()?

line 60 calls .remove, so args changes and the check is made again.

because if it's empty after removing one arg (the arg it's typing actively) it means it's the first argument, which would be a --flag

J3fftw1 · 2024-03-05T08:19:48Z

src/main/java/dev/j3fftw/worldeditslimefun/commands/WorldEditSlimefunCommands.java

+                return availableFlags;
+            }
+
+            String lastArg = args.get(args.size() - 1);


shouldnt this use currentArg?

oh I guess I never actually use currentArg do I, lol.

I can probably remove the variable declaration then? But it might make it even less readable doing so

currentArg is the argument actively being typed. acf will handle filtering the options based on the current argument so leaving it alone is all we need to do. What's really important is knowing what the last full argument was.

src/main/java/dev/j3fftw/worldeditslimefun/commands/WorldEditSlimefunCommands.java

Co-authored-by: J3fftw <[email protected]>

JustAHuman-xD · 2024-03-05T13:06:14Z

Btw do you plan on adding this to blob builds? Or just purely GitHub releases

JustAHuman-xD · 2024-03-05T14:52:21Z

I am apparently not allowed to rename the branch, whoops lol

JustAHuman-xD · 2024-03-09T00:24:34Z

I'll rebase and update the PR name & desc later today

…-feature

JustAHuman-xD · 2024-03-09T23:48:26Z

I've tested the new task flags, all now work as intended!

JustAHuman-xD · 2024-03-12T00:24:19Z

One thing I still need to do is add those new flags to the readme

J3fftw1 · 2024-03-15T14:55:27Z

have you tested this?

properly shape depends, add wand

1de9d7c

J3fftw1 suggested changes Feb 16, 2024

View reviewed changes

abstraction, cleanup, and simplification

1c0bb33

JustAHuman-xD added 2 commits February 16, 2024 13:35

suggested changes, fix wand cmd, paste command changes

fe7f320

Remove finals, actually use block position

2e6931e

WalshyDev reviewed Feb 16, 2024

View reviewed changes

README.md Outdated Show resolved Hide resolved

JustAHuman-xD added 2 commits February 16, 2024 13:45

actually care about energy lol

b6d0344

Use a flags system (Jeff.... this took me so long)

4f0da61

JustAHuman-xD changed the title ~~[Fix] Shade Dependencies Properly [Feature] Add Wand~~ [Update] Add new Features & Fixes (see desc) Mar 5, 2024

remove those comments

e1726b6

J3fftw1 suggested changes Mar 5, 2024

View reviewed changes

Update README.md

38e0d5f

Co-authored-by: J3fftw <[email protected]>

JustAHuman-xD closed this Mar 5, 2024

JustAHuman-xD deleted the fix/bstats-and-wand-feature branch March 5, 2024 14:50

JustAHuman-xD restored the fix/bstats-and-wand-feature branch March 5, 2024 14:52

JustAHuman-xD reopened this Mar 5, 2024

JustAHuman-xD added 2 commits March 5, 2024 08:53

add comment

cf8cc53

add refill inputs, void outputs, and timeout flag

c348b8c

JustAHuman-xD added 2 commits March 9, 2024 10:32

Merge branch 'Slimefun-Addon-Community:main' into fix/bstats-and-wand…

8871a42

…-feature

clone the item, dont always push the same one

8defb52

JustAHuman-xD requested review from J3fftw1 and WalshyDev March 9, 2024 23:48

JustAHuman-xD added 2 commits March 11, 2024 23:05

add permission checks to wand

d6c0425

update readme

68b0dcf

J3fftw1 merged commit b682812 into Slimefun-Addon-Community:main Mar 15, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Update] Add new Features & Fixes (see desc) #4

[Update] Add new Features & Fixes (see desc) #4

JustAHuman-xD commented Feb 16, 2024 •

edited

Loading

J3fftw1 left a comment

JustAHuman-xD commented Feb 16, 2024

JustAHuman-xD commented Feb 16, 2024

J3fftw1 commented Feb 16, 2024

JustAHuman-xD commented Mar 5, 2024

J3fftw1 left a comment

J3fftw1 Mar 5, 2024

JustAHuman-xD Mar 5, 2024

J3fftw1 Mar 5, 2024

JustAHuman-xD Mar 5, 2024

JustAHuman-xD Mar 5, 2024

JustAHuman-xD commented Mar 5, 2024

JustAHuman-xD commented Mar 5, 2024

JustAHuman-xD commented Mar 9, 2024

JustAHuman-xD commented Mar 9, 2024

JustAHuman-xD commented Mar 12, 2024

J3fftw1 commented Mar 15, 2024

[Update] Add new Features & Fixes (see desc) #4

[Update] Add new Features & Fixes (see desc) #4

Conversation

JustAHuman-xD commented Feb 16, 2024 • edited Loading

To Do

Changes (Small ones)

Command Changes

WorldEditSlimefunCommands Changes

CommandFlags

Other

J3fftw1 left a comment

Choose a reason for hiding this comment

JustAHuman-xD commented Feb 16, 2024

JustAHuman-xD commented Feb 16, 2024

J3fftw1 commented Feb 16, 2024

JustAHuman-xD commented Mar 5, 2024

J3fftw1 left a comment

Choose a reason for hiding this comment

J3fftw1 Mar 5, 2024

Choose a reason for hiding this comment

JustAHuman-xD Mar 5, 2024

Choose a reason for hiding this comment

J3fftw1 Mar 5, 2024

Choose a reason for hiding this comment

JustAHuman-xD Mar 5, 2024

Choose a reason for hiding this comment

JustAHuman-xD Mar 5, 2024

Choose a reason for hiding this comment

JustAHuman-xD commented Mar 5, 2024

JustAHuman-xD commented Mar 5, 2024

JustAHuman-xD commented Mar 9, 2024

JustAHuman-xD commented Mar 9, 2024

JustAHuman-xD commented Mar 12, 2024

J3fftw1 commented Mar 15, 2024

JustAHuman-xD commented Feb 16, 2024 •

edited

Loading