Command rework (#1434)

* Network part finished.

* Should be more reasonable now

* This should be good enough.

* Orb finished, needs strings

* Bind finished. Needs strings.

* Reformat & Help subcommand

* Cleanup, strings, no negative amounts

* Removed TODOs

* Added missing MaxTier check for Blood Orbs.
Added TODO: Test with custom Blood Orbs.

* Ritual commands finished.
Check for valid placement might be optimized. (TODO)

* Access modifiers, moved TODO

* Added TODOs for localized strings

* DrainUtils postponed until the necessary functionality is available with SoulTickets (telling SoulTicket network from soul ticket, a list of all registered soul tickets per network)

* Replaced all occurrences of TextHelper with TextComponentTranslation in the commands section

* - Moved Teleports.java to teleport package
- added teleposer command
- added missing strings
- cleanup

* Fixed spelling of "Successful(ly)"

* getUsage() now returns translation keys.
getInfo() is now an explicit String

ritual creation command now has proper tab completions

help is an additional argument with "-h" or "?"

cleanup

* teleposerSet final
cleanup.

* Removed ritual removal command

Signed-off-by: tobias <angryaeon@icloud.com>

* Check if the tile has a ritual first

Signed-off-by: tobias <angryaeon@icloud.com>

* A bit more optimisation

Signed-off-by: tobias <angryaeon@icloud.com>

* Cleanup part 1

Signed-off-by: tobias <angryaeon@icloud.com>

* Cleanup part 2

Signed-off-by: tobias <angryaeon@icloud.com>

* Part 3

Signed-off-by: tobias <angryaeon@icloud.com>

* Part 4

Signed-off-by: tobias <angryaeon@icloud.com>

* Updated language file to reflect cleanup & continuity changes.

Signed-off-by: tobias <angryaeon@icloud.com>

* Change to use an abstract class that gets called instead of calling super on overriden execute() for commands

Signed-off-by: tobias <angryaeon@icloud.com>

* Use player facing for ritual creation.

Signed-off-by: tobias <angryaeon@icloud.com>
This commit is contained in:
Tobias Gremeyer 2019-02-01 01:46:02 +01:00 committed by Nick Ignoffo
parent 2a8e1f1271
commit 95d99c0a01
13 changed files with 990 additions and 323 deletions

View file

@ -817,9 +817,8 @@ entity.bloodmagic.Mimic.name=Mimic
commands.bloodmagic.error.arg.invalid=Invalid arguments
commands.bloodmagic.error.arg.missing=Not enough arguments
commands.bloodmagic.error.arg.player.missing=You must specify which player you wish to perform this action on.
commands.bloodmagic.error.404=Command not found!
commands.bloodmagic.error.unknown=Unknown command!
commands.bloodmagic.error.perm=You do not have permission to use this command.
commands.bloodmagic.error.negative=Amount must be a positive Integer.
commands.bloodmagic.error.outofbounds=Given integer is too large (must be within list ID boundaries).
commands.bloodmagic.success=Executed successfully
@ -833,42 +832,67 @@ commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap]
commands.bloodmagic.network.help=LP network utilities
commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network.
commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s.
commands.bloodmagic.network.syphon.usage=/bloodmagic network syphon [player] [amount]
commands.bloodmagic.network.syphon.amountTooHigh=Cannot syphon more LP than available.
commands.bloodmagic.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules.
commands.bloodmagic.network.add.usage=/bloodmagic network add [player] [amount]
commands.bloodmagic.network.add.success=Successfully added %d LP to %s's LP network.
commands.bloodmagic.network.set.help=Sets the given player's LP to the given amount.
commands.bloodmagic.network.set.usage=/bloodmagic network set [player] [amount]
commands.bloodmagic.network.set.success=Successfully set %s's LP network to %d LP.
commands.bloodmagic.network.get.help=Returns the amount of LP in the given player's LP network.
commands.bloodmagic.network.get.usage=/bloodmagic network get [player]
commands.bloodmagic.network.fill.help=Fills the given player's LP network to %d.
commands.bloodmagic.network.fill.usage=/bloodmagic network fill [player]
commands.bloodmagic.network.fill.success=Successfully filled %s's LP network.
commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store.
commands.bloodmagic.network.cap.usage=/bloodmagic network cap [player]
commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network.
commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player]
commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player] ("?" or "help" for help)
commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item.
commands.bloodmagic.bind.success=Binding successful
commands.bloodmagic.bind.success=Successfully bound to %d.
commands.bloodmagic.bind.remove.success=Unbinding successful
commands.bloodmagic.bind.error.ownerEqualsTarget=Nothing changed: Target and current owner are equal.
commands.bloodmagic.bind.error.notBound=Cannot unbind: Item not bound.
commands.bloodmagic.bind.error.notBindable=Cannot bind: Item not bindable.
commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier]
commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier] ("?" or "help" for help)
commands.bloodmagic.orb.help=Used to set or get the Player's max Blood Orb tier.
commands.bloodmagic.orb.get.help=Used to get the Player's max Blood Orb tier.
commands.bloodmagic.orb.get.usage=/bloodmagic orb get [player|?|help]
commands.bloodmagic.orb.set.help=Used to set the Player's max Blood Orb tier.
commands.bloodmagic.orb.set.usage=/bloodmagic orb set [player|?|help]
commands.bloodmagic.orb.currenttier=Current Orb tier is %d.
commands.bloodmagic.orb.error.tierTooHigh=Orb tier cannot be higher than %d.
commands.bloodmagic.bind.failed.noPlayer=There is no player specified
commands.bloodmagic.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it
commands.bloodmagic.bind.failed.notBindable=Item cannot be bound
commands.bloodmagic.unbind.usage=/unbind
commands.bloodmagic.unbind.success=Item successfully unbound!
commands.bloodmagic.unbind.failed.notBindable=Item cannot be unbound
commands.bloodmagic.soulnetwork.usage=/soulnetwork <player> <add|subtract|fill|empty|get> [amount]
commands.bloodmagic.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network!
commands.bloodmagic.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network!
commands.bloodmagic.soulnetwork.fill.success=Successfully filled %s's Soul Network!
commands.bloodmagic.soulnetwork.empty.success=Successfully emptied %s's Soul Network!
commands.bloodmagic.soulnetwork.get.success=There is %dLP in %s's Soul Network!
commands.bloodmagic.soulnetwork.noPlayer=There is no player specified
commands.bloodmagic.soulnetwork.noCommand=There is no command specified
commands.bloodmagic.soulnetwork.notACommand=That is not a valid command
commands.bloodmagic.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max!
commands.bloodmagic.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d)
commands.bloodmagic.ritual.create.help=Creates the specified ritual with the MRS at your feet, ignores other blocks by default. (Optional parameters: ([<player> (safe|true|false)] | [safe|true|false]))
commands.bloodmagic.ritual.repair.help=Repairs the ritual with the closest match to the remaining ritual stones, ignores other blocks by default. (Optional parameters: ([<player> (safe|true|false)] | [safe|true|false]))
commands.bloodmagic.ritual.create.noRitual=You must select a ritual. (Tab-completions are available!)
commands.bloodmagic.ritaul.create.error.unsafe=Created or repaired ritual cannot be placed safely.
commands.bloodmagic.ritual.create.error.outOfWorldBoundaries=Created or repaired ritual would be out of world boundaries.
commands.bloodmagic.ritual.error.noMRS=You need to stand on a Master Ritual Stone to execute the command!
commands.bloodmagic.teleposer.usage=Teleposer Utilities ("?" or "help" for help)
commands.bloodmagic.teleposer.list.help=Returns a list of all valid teleposers, optionally possessed by [player].
commands.bloodmagic.teleposer.list.usage=/bloodmagic teleposer list [player|?|help]
commands.bloodmagic.teleposer.teleport.help=Teleports to the location of the specified teleposer.
commands.bloodmagic.teleposer.teleport.usage=/bloodmagic teleposer teleport [ID|?|help]
commands.bloodmagic.teleposer.teleportfocus.help=Teleports to the location stored in the specified teleposer's focus.
commands.bloodmagic.teleposer.teleportfocus.usage=/bloodmagic teleposer teleportfocus [ID|?|help]
commands.bloodmagic.teleposer.rmrf.help=Follows teleposer foci and removes all teleposers along the path, starting with the specified teleposer.
commands.bloodmagic.teleposer.rmrf.usage=/bloodmagic teleposer rmrf [ID|?|help]
commands.bloodmagic.teleposer.remove.help=Removes the specified teleposer.
commands.bloodmagic.teleposer.remove.usage=/bloodmagic teleposer remove [ID|?|help]
commands.bloodmagic.teleposer.removeall.help=Removes all teleposers or all teleposers containing a focus bound to [player], if specified.
commands.bloodmagic.teleposer.removeall.usage=/bloodmagic teleposer removeall [player|?|help]
#Used by commands.bloodmagic.teleposer.list for the dump sent to the player
commands.bloodmagic.teleposer.anddimension=: Teleposer: DimID:
commands.bloodmagic.teleposer.focusanddim=Focus: DimID:
commands.bloodmagic.teleposer.owner=Owner:
# GUI