Skip to content

Commit

Permalink
Rework delete command so it's less complex to use (ldtteam#9540)
Browse files Browse the repository at this point in the history 
Rework delete command so it's less complex to use
  • Loading branch information
@Raycoms
Raycoms committed Dec 18, 2023
1 parent d9db860 commit f1074c8
Show file tree
Hide file tree
Showing 5 changed files with 251 additions and 103 deletions.
138 changes: 77 additions & 61 deletions src/api/java/com/minecolonies/api/util/constant/translation/CommandTranslationConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,125 +8,141 @@
public class CommandTranslationConstants
{
@NonNls
public static final String COMMAND_REQUIRES_OP = "com.minecolonies.command.notop";
public static final String COMMAND_REQUIRES_OP = "com.minecolonies.command.notop";
@NonNls
public static final String COMMAND_DISABLED_IN_CONFIG = "com.minecolonies.command.notenabledinconfig";
public static final String COMMAND_DISABLED_IN_CONFIG = "com.minecolonies.command.notenabledinconfig";
@NonNls
public static final String COMMAND_COLONY_ID_NOT_FOUND = "com.minecolonies.command.colonyidnotfound";
public static final String COMMAND_COLONY_ID_NOT_FOUND = "com.minecolonies.command.colonyidnotfound";
@NonNls
public static final String COMMAND_CITIZEN_NOT_FOUND = "com.minecolonies.command.citizeninfo.notfound";
public static final String COMMAND_CITIZEN_NOT_FOUND = "com.minecolonies.command.citizeninfo.notfound";
@NonNls
public static final String COMMAND_CITIZEN_NOT_LOADED = "com.minecolonies.command.citizeninfo.notloaded";
public static final String COMMAND_CITIZEN_NOT_LOADED = "com.minecolonies.command.citizeninfo.notloaded";
@NonNls
public static final String COMMAND_ENTITY_NOT_FOUND = "com.minecolonies.command.noentityfound";
public static final String COMMAND_ENTITY_NOT_FOUND = "com.minecolonies.command.noentityfound";
@NonNls
public static final String COMMAND_PLAYER_NOT_FOUND = "com.minecolonies.command.playernotfound";
public static final String COMMAND_PLAYER_NOT_FOUND = "com.minecolonies.command.playernotfound";
@NonNls
public static final String COMMAND_CITIZEN_INFO = "com.minecolonies.command.citizeninfo.desc";
public static final String COMMAND_CITIZEN_INFO = "com.minecolonies.command.citizeninfo.desc";
@NonNls
public static final String COMMAND_CITIZEN_INFO_POSITION = "com.minecolonies.command.citizeninfo.pos";
public static final String COMMAND_CITIZEN_INFO_POSITION = "com.minecolonies.command.citizeninfo.pos";
@NonNls
public static final String COMMAND_CITIZEN_INFO_HOME_POSITION = "com.minecolonies.command.citizeninfo.homepos";
public static final String COMMAND_CITIZEN_INFO_HOME_POSITION = "com.minecolonies.command.citizeninfo.homepos";
@NonNls
public static final String COMMAND_CITIZEN_INFO_HEALTH = "com.minecolonies.command.citizeninfo.health";
public static final String COMMAND_CITIZEN_INFO_HEALTH = "com.minecolonies.command.citizeninfo.health";
@NonNls
public static final String COMMAND_CITIZEN_INFO_SKILLS = "com.minecolonies.command.citizeninfo.skills";
public static final String COMMAND_CITIZEN_INFO_SKILLS = "com.minecolonies.command.citizeninfo.skills";
@NonNls
public static final String COMMAND_CITIZEN_INFO_WORKING_POSITION = "com.minecolonies.command.citizeninfo.workpos";
public static final String COMMAND_CITIZEN_INFO_WORKING_POSITION = "com.minecolonies.command.citizeninfo.workpos";
@NonNls
public static final String COMMAND_CITIZEN_INFO_NO_WORKING_POSITION = "com.minecolonies.command.citizeninfo.workposnull";
public static final String COMMAND_CITIZEN_INFO_NO_WORKING_POSITION = "com.minecolonies.command.citizeninfo.workposnull";
@NonNls
public static final String COMMAND_CITIZEN_INFO_JOB = "com.minecolonies.command.citizeninfo.job";
public static final String COMMAND_CITIZEN_INFO_JOB = "com.minecolonies.command.citizeninfo.job";
@NonNls
public static final String COMMAND_CITIZEN_INFO_NO_JOB = "com.minecolonies.command.citizeninfo.jobnull";
public static final String COMMAND_CITIZEN_INFO_NO_JOB = "com.minecolonies.command.citizeninfo.jobnull";
@NonNls
public static final String COMMAND_CITIZEN_INFO_ACTIVITY = "com.minecolonies.command.citizeninfo.activity";
public static final String COMMAND_CITIZEN_INFO_ACTIVITY = "com.minecolonies.command.citizeninfo.activity";
@NonNls
public static final String COMMAND_CITIZEN_INFO_NO_ACTIVITY = "com.minecolonies.command.citizeninfo.noactivity";
public static final String COMMAND_CITIZEN_INFO_NO_ACTIVITY = "com.minecolonies.command.citizeninfo.noactivity";
@NonNls
public static final String COMMAND_CITIZEN_KILL_SUCCESS = "com.minecolonies.command.citizenkill.success";
public static final String COMMAND_CITIZEN_KILL_SUCCESS = "com.minecolonies.command.citizenkill.success";
@NonNls
public static final String COMMAND_CITIZEN_LIST_PAGE_TOP = "com.minecolonies.command.citizenlist.pagetop";
public static final String COMMAND_CITIZEN_LIST_PAGE_TOP = "com.minecolonies.command.citizenlist.pagetop";
@NonNls
public static final String COMMAND_CITIZEN_LIST_PAGE_LINE = "com.minecolonies.command.citizenlist.pageline";
public static final String COMMAND_CITIZEN_LIST_PAGE_LINE = "com.minecolonies.command.citizenlist.pageline";
@NonNls
public static final String COMMAND_CITIZEN_LIST_PAGE_STYLE = "com.minecolonies.command.citizenlist.pagestyle";
public static final String COMMAND_CITIZEN_LIST_PAGE_STYLE = "com.minecolonies.command.citizenlist.pagestyle";
@NonNls
public static final String COMMAND_CITIZEN_LIST_PREVIOUS = "com.minecolonies.command.citizenlist.prev";
public static final String COMMAND_CITIZEN_LIST_PREVIOUS = "com.minecolonies.command.citizenlist.prev";
@NonNls
public static final String COMMAND_CITIZEN_LIST_NEXT = "com.minecolonies.command.citizenlist.next";
public static final String COMMAND_CITIZEN_LIST_NEXT = "com.minecolonies.command.citizenlist.next";
@NonNls
public static final String COMMAND_CITIZEN_RELOAD_SUCCESS = "com.minecolonies.command.citizenreload.success";
public static final String COMMAND_CITIZEN_RELOAD_SUCCESS = "com.minecolonies.command.citizenreload.success";
@NonNls
public static final String COMMAND_CITIZEN_SPAWN_SUCCESS = "com.minecolonies.command.citizenspawn.success";
public static final String COMMAND_CITIZEN_SPAWN_SUCCESS = "com.minecolonies.command.citizenspawn.success";
@NonNls
public static final String COMMAND_TELEPORT_SUCCESS = "com.minecolonies.command.teleport.success";
public static final String COMMAND_TELEPORT_SUCCESS = "com.minecolonies.command.teleport.success";
@NonNls
public static final String COMMAND_ENTITY_TRACK_ENABLED = "com.minecolonies.command.citizentrack.success.enable";
public static final String COMMAND_ENTITY_TRACK_ENABLED = "com.minecolonies.command.citizentrack.success.enable";
@NonNls
public static final String COMMAND_ENTITY_TRACK_DISABLED = "com.minecolonies.command.citizentrack.success.disable";
public static final String COMMAND_ENTITY_TRACK_DISABLED = "com.minecolonies.command.citizentrack.success.disable";
@NonNls
public static final String COMMAND_OFFICER_ADD_SUCCESS = "com.minecolonies.command.addofficer.success";
public static final String COMMAND_OFFICER_ADD_SUCCESS = "com.minecolonies.command.addofficer.success";
@NonNls
public static final String COMMAND_CAN_RAIDER_SPAWN_SUCCESS = "com.minecolonies.command.canspawnraider.success";
public static final String COMMAND_CAN_RAIDER_SPAWN_SUCCESS = "com.minecolonies.command.canspawnraider.success";
@NonNls
public static final String COMMAND_OWNER_CHANGE_SUCCESS = "com.minecolonies.command.ownerchange.success";
public static final String COMMAND_OWNER_CHANGE_SUCCESS = "com.minecolonies.command.ownerchange.success";
@NonNls
public static final String COMMAND_CLAIM_SUCCESS = "com.minecolonies.command.claim.success";
public static final String COMMAND_CLAIM_SUCCESS = "com.minecolonies.command.claim.success";
@NonNls
public static final String COMMAND_CLAIM_REMOVE_CLAIM = "com.minecolonies.command.claim.unclaim";
public static final String COMMAND_CLAIM_REMOVE_CLAIM = "com.minecolonies.command.claim.unclaim";
@NonNls
public static final String COMMAND_CLAIM_TOO_LARGE = "com.minecolonies.command.claim.toolarge";
public static final String COMMAND_CLAIM_TOO_LARGE = "com.minecolonies.command.claim.toolarge";
@NonNls
public static final String COMMAND_CLAIM_MAX_CHUNKS = "com.minecolonies.command.claim.maxchunks";
public static final String COMMAND_CLAIM_MAX_CHUNKS = "com.minecolonies.command.claim.maxchunks";
@NonNls
public static final String COMMAND_COLONY_DELETE_SUCCESS = "com.minecolonies.command.delete.success";
public static final String COMMAND_COLONY_DELETE_SUCCESS = "com.minecolonies.command.delete.success";
@NonNls
public static final String COMMAND_COLONY_DELETABLE_SUCCESS = "com.minecolonies.command.deleteable.success";
public static final String COMMAND_COLONY_DELETE_CONFIRM_BUILDING = "com.minecolonies.command.delete.confirm.building";
@NonNls
public static final String COMMAND_COLONY_EXPORT_SUCCESS = "com.minecolonies.command.export.success";
public static final String COMMAND_COLONY_DELETE_CONFIRM_BUILDING_KEEP = "com.minecolonies.command.delete.confirm.building.keep";
@NonNls
public static final String COMMAND_COLONY_LOAD_BACKUP_SUCCESS = "com.minecolonies.command.loadbackup.success";
public static final String COMMAND_COLONY_DELETE_CONFIRM_BUILDING_DELETE = "com.minecolonies.command.delete.confirm.building.delete";
@NonNls
public static final String COMMAND_RAID_NOW_SUCCESS = "com.minecolonies.command.raidnow.success";
public static final String COMMAND_COLONY_DELETE_CONFIRM_FINAL = "com.minecolonies.command.delete.confirm.final";
@NonNls
public static final String COMMAND_RAID_NOW_FAILURE = "com.minecolonies.command.raidnow.failure";
public static final String COMMAND_COLONY_DELETE_CONFIRM_FINAL_BUILDING = "com.minecolonies.command.delete.confirm.final.building";
@NonNls
public static final String COMMAND_RAID_TONIGHT_SUCCESS = "com.minecolonies.command.raidtonight.success";
public static final String COMMAND_COLONY_DELETE_CONFIRM_FINAL_HERE = "com.minecolonies.command.delete.confirm.final.here";
@NonNls
public static final String COMMAND_REQUEST_SYSTEM_RESET_SUCCESS = "com.minecolonies.command.rsreset.success";
public static final String COMMAND_COLONY_DELETE_SUGGEST_KEEP = "com.minecolonies.command.delete.confirm.suggest.keep";
@NonNls
public static final String COMMAND_REQUEST_SYSTEM_RESET_ALL_SUCCESS = "com.minecolonies.command.rsresetall.success";
public static final String COMMAND_COLONY_DELETE_SUGGEST_DELETE = "com.minecolonies.command.delete.confirm.suggest.delete";
@NonNls
public static final String COMMAND_BACKUP_SUCCESS = "com.minecolonies.command.backup.success";
public static final String COMMAND_COLONY_DELETABLE_SUCCESS = "com.minecolonies.command.deleteable.success";
@NonNls
public static final String COMMAND_BACKUP_FAILED = "com.minecolonies.command.backup.failed";
public static final String COMMAND_COLONY_EXPORT_SUCCESS = "com.minecolonies.command.export.success";
@NonNls
public static final String COMMAND_HELP_INFO_WIKI = "com.minecolonies.command.help.wiki";
public static final String COMMAND_COLONY_LOAD_BACKUP_SUCCESS = "com.minecolonies.command.loadbackup.success";
@NonNls
public static final String COMMAND_HELP_INFO_DISCORD = "com.minecolonies.command.help.discord";
public static final String COMMAND_RAID_NOW_SUCCESS = "com.minecolonies.command.raidnow.success";
@NonNls
public static final String COMMAND_PRUNE_WORLD_WARNING = "com.minecolonies.command.prune.next";
public static final String COMMAND_RAID_NOW_FAILURE = "com.minecolonies.command.raidnow.failure";
@NonNls
public static final String COMMAND_RAID_TONIGHT_WARNING = "com.minecolonies.command.raidtonight";
public static final String COMMAND_RAID_TONIGHT_SUCCESS = "com.minecolonies.command.raidtonight.success";
@NonNls
public static final String COMMAND_RESET_SUPPLY_SUCCESS = "com.minecolonies.command.raidtonight";
public static final String COMMAND_REQUEST_SYSTEM_RESET_SUCCESS = "com.minecolonies.command.rsreset.success";
@NonNls
public static final String COMMAND_RTP_SUCCESS = "com.minecolonies.command.rtp.success";
public static final String COMMAND_REQUEST_SYSTEM_RESET_ALL_SUCCESS = "com.minecolonies.command.rsresetall.success";
@NonNls
public static final String COMMAND_RTP_NOT_ALLOWED = "com.minecolonies.command.rtp.notallowed";
public static final String COMMAND_BACKUP_SUCCESS = "com.minecolonies.command.backup.success";
@NonNls
public static final String COMMAND_RTP_WRONG_DIMENSION = "com.minecolonies.command.rtp.wrongdim";
public static final String COMMAND_BACKUP_FAILED = "com.minecolonies.command.backup.failed";
@NonNls
public static final String COMMAND_RTP_NO_POSITION = "com.minecolonies.command.rtp.nopositionfound";
public static final String COMMAND_HELP_INFO_WIKI = "com.minecolonies.command.help.wiki";
@NonNls
public static final String COMMAND_WHERE_AM_I_NO_COLONY = "com.minecolonies.command.whereami.nocolony";
public static final String COMMAND_HELP_INFO_DISCORD = "com.minecolonies.command.help.discord";
@NonNls
public static final String COMMAND_WHERE_AM_I_COLONY_CLOSE = "com.minecolonies.command.whereami.colonyclose";
public static final String COMMAND_PRUNE_WORLD_WARNING = "com.minecolonies.command.prune.next";
@NonNls
public static final String COMMAND_WHERE_AM_I_IN_COLONY = "com.minecolonies.command.whereami.incolony";
public static final String COMMAND_RAID_TONIGHT_WARNING = "com.minecolonies.command.raidtonight";
@NonNls
public static final String COMMAND_WHO_AM_I_NO_COLONY = "com.minecolonies.command.whoami.nocolony";
public static final String COMMAND_RESET_SUPPLY_SUCCESS = "com.minecolonies.command.raidtonight";
@NonNls
public static final String COMMAND_WHO_AM_I_HAS_COLONY = "com.minecolonies.command.whoami.hascolony";
public static final String COMMAND_RTP_SUCCESS = "com.minecolonies.command.rtp.success";
@NonNls
public static final String COMMAND_RTP_NOT_ALLOWED = "com.minecolonies.command.rtp.notallowed";
@NonNls
public static final String COMMAND_RTP_WRONG_DIMENSION = "com.minecolonies.command.rtp.wrongdim";
@NonNls
public static final String COMMAND_RTP_NO_POSITION = "com.minecolonies.command.rtp.nopositionfound";
@NonNls
public static final String COMMAND_WHERE_AM_I_NO_COLONY = "com.minecolonies.command.whereami.nocolony";
@NonNls
public static final String COMMAND_WHERE_AM_I_COLONY_CLOSE = "com.minecolonies.command.whereami.colonyclose";
@NonNls
public static final String COMMAND_WHERE_AM_I_IN_COLONY = "com.minecolonies.command.whereami.incolony";
@NonNls
public static final String COMMAND_WHO_AM_I_NO_COLONY = "com.minecolonies.command.whoami.nocolony";
@NonNls
public static final String COMMAND_WHO_AM_I_HAS_COLONY = "com.minecolonies.command.whoami.hascolony";
}
2 changes: 1 addition & 1 deletion ...n/java/com/minecolonies/coremod/commands/citizencommands/CommandCitizenTriggerWalkTo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ public LiteralArgumentBuilder<CommandSourceStack> build()
.then(IMCCommand.newArgument(COLONYID_ARG, IntegerArgumentType.integer(1))
.then(IMCCommand.newArgument(CITIZENID_ARG, IntegerArgumentType.integer(1))
.then(IMCCommand.newArgument(POS_ARG, Vec3Argument.vec3())
.executes(executePreConditionCheck().then(this::onExecute)))));
.executes(this::checkPreConditionAndExecute))));
}
}
Loading

0 comments on commit f1074c8

Please sign in to comment.