mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Added a command for easier usage of the bed (/bed), Added relative coordinates support for the /dig command.
Added a command for easier usage of the bed (/bed). Added relative coordinates support for the /dig command.
This commit is contained in:
commit
3656dfdbcd
5 changed files with 202 additions and 4 deletions
|
|
@ -33,7 +33,7 @@ namespace MinecraftClient.ChatBots
|
||||||
deleteAllOnExit = Settings.Map_Delete_All_On_Unload;
|
deleteAllOnExit = Settings.Map_Delete_All_On_Unload;
|
||||||
notifyOnFirstUpdate = Settings.Map_Notify_On_First_Update;
|
notifyOnFirstUpdate = Settings.Map_Notify_On_First_Update;
|
||||||
|
|
||||||
RegisterChatBotCommand("maps", "bot.map.cmd.desc", "maps <list/render <id>> | maps <l/r <id>>", OnMapCommand);
|
RegisterChatBotCommand("maps", "bot.map.cmd.desc", "maps list|render <id> or maps l|r <id>", OnMapCommand);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnUnload()
|
public override void OnUnload()
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,11 @@ namespace MinecraftClient.Commands
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
int x = int.Parse(args[0]);
|
Location current = handler.GetCurrentLocation();
|
||||||
int y = int.Parse(args[1]);
|
double x = args[0].StartsWith('~') ? current.X + (args[0].Length > 1 ? double.Parse(args[0][1..]) : 0) : double.Parse(args[0]);
|
||||||
int z = int.Parse(args[2]);
|
double y = args[1].StartsWith('~') ? current.Y + (args[1].Length > 1 ? double.Parse(args[1][1..]) : 0) : double.Parse(args[1]);
|
||||||
|
double z = args[2].StartsWith('~') ? current.Z + (args[2].Length > 1 ? double.Parse(args[2][1..]) : 0) : double.Parse(args[2]);
|
||||||
|
|
||||||
Location blockToBreak = new Location(x, y, z);
|
Location blockToBreak = new Location(x, y, z);
|
||||||
if (blockToBreak.DistanceSquared(handler.GetCurrentLocation().EyesLocation()) > 25)
|
if (blockToBreak.DistanceSquared(handler.GetCurrentLocation().EyesLocation()) > 25)
|
||||||
return Translations.Get("cmd.dig.too_far");
|
return Translations.Get("cmd.dig.too_far");
|
||||||
|
|
|
||||||
150
MinecraftClient/Commands/Leavebed.cs
Normal file
150
MinecraftClient/Commands/Leavebed.cs
Normal file
|
|
@ -0,0 +1,150 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using MinecraftClient.Mapping;
|
||||||
|
|
||||||
|
namespace MinecraftClient.Commands
|
||||||
|
{
|
||||||
|
public class BedCommand : Command
|
||||||
|
{
|
||||||
|
public override string CmdName { get { return "bed"; } }
|
||||||
|
public override string CmdUsage { get { return "bed leave|sleep <x> <y> <z>|sleep <radius>"; } }
|
||||||
|
public override string CmdDesc { get { return "cmd.bed.desc"; } }
|
||||||
|
|
||||||
|
public override string Run(McClient handler, string command, Dictionary<string, object> localVars)
|
||||||
|
{
|
||||||
|
string[] args = getArgs(command);
|
||||||
|
|
||||||
|
if (args.Length >= 1)
|
||||||
|
{
|
||||||
|
string subcommand = args[0].ToLower().Trim();
|
||||||
|
|
||||||
|
if (subcommand.Equals("leave") || subcommand.Equals("l"))
|
||||||
|
{
|
||||||
|
handler.SendEntityAction(Protocol.EntityActionType.LeaveBed);
|
||||||
|
return Translations.TryGet("cmd.bed.leaving");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (subcommand.Equals("sleep") || subcommand.Equals("s"))
|
||||||
|
{
|
||||||
|
if (args.Length == 2)
|
||||||
|
{
|
||||||
|
if (!int.TryParse(args[1], out int radius))
|
||||||
|
return CmdUsage;
|
||||||
|
|
||||||
|
handler.GetLogger().Info(Translations.TryGet("cmd.bed.searching", radius));
|
||||||
|
|
||||||
|
Location current = handler.GetCurrentLocation();
|
||||||
|
Location bedLocation = current;
|
||||||
|
|
||||||
|
Material[] bedMaterialList = new Material[]{
|
||||||
|
Material.BlackBed,
|
||||||
|
Material.BlueBed,
|
||||||
|
Material.BrownBed,
|
||||||
|
Material.CyanBed,
|
||||||
|
Material.GrayBed,
|
||||||
|
Material.GreenBed,
|
||||||
|
Material.LightBlueBed,
|
||||||
|
Material.LightGrayBed,
|
||||||
|
Material.LimeBed,
|
||||||
|
Material.MagentaBed,
|
||||||
|
Material.OrangeBed,
|
||||||
|
Material.PinkBed,
|
||||||
|
Material.PurpleBed,
|
||||||
|
Material.RedBed,
|
||||||
|
Material.WhiteBed,
|
||||||
|
Material.YellowBed
|
||||||
|
};
|
||||||
|
|
||||||
|
bool found = false;
|
||||||
|
foreach (Material material in bedMaterialList)
|
||||||
|
{
|
||||||
|
List<Location> beds = handler.GetWorld().FindBlock(current, material, radius);
|
||||||
|
|
||||||
|
if (beds.Count > 0)
|
||||||
|
{
|
||||||
|
found = true;
|
||||||
|
bedLocation = beds.First();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found)
|
||||||
|
return Translations.TryGet("cmd.bed.bed_not_found");
|
||||||
|
|
||||||
|
handler.Log.Info(Translations.TryGet("cmd.bed.found_a_bed_at", bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||||
|
|
||||||
|
if (!Movement.CheckChunkLoading(handler.GetWorld(), current, bedLocation))
|
||||||
|
return Translations.Get("cmd.move.chunk_not_loaded", bedLocation.X, bedLocation.Y, bedLocation.Z);
|
||||||
|
|
||||||
|
if (handler.MoveTo(bedLocation))
|
||||||
|
{
|
||||||
|
Task.Factory.StartNew(() =>
|
||||||
|
{
|
||||||
|
bool atTheLocation = false;
|
||||||
|
DateTime timeout = DateTime.Now.AddSeconds(60);
|
||||||
|
|
||||||
|
while (DateTime.Now < timeout)
|
||||||
|
{
|
||||||
|
if (handler.GetCurrentLocation() == bedLocation || handler.GetCurrentLocation().Distance(bedLocation) <= 2.0)
|
||||||
|
{
|
||||||
|
atTheLocation = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!atTheLocation)
|
||||||
|
{
|
||||||
|
handler.Log.Info(Translations.TryGet("cmd.bed.failed_to_reach_in_time", bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
handler.Log.Info(Translations.TryGet("cmd.bed.moving", bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||||
|
|
||||||
|
bool res = handler.PlaceBlock(bedLocation, Direction.Down);
|
||||||
|
|
||||||
|
handler.Log.Info(Translations.TryGet(
|
||||||
|
"cmd.bed.trying_to_use",
|
||||||
|
bedLocation.X,
|
||||||
|
bedLocation.Y,
|
||||||
|
bedLocation.Z,
|
||||||
|
Translations.TryGet(res ? "cmd.bed.in" : "cmd.bed.not_in")
|
||||||
|
));
|
||||||
|
});
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
return Translations.Get("cmd.bed.cant_reach_safely");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.Length >= 3)
|
||||||
|
{
|
||||||
|
Location current = handler.GetCurrentLocation();
|
||||||
|
double x = args[1].StartsWith('~') ? current.X + (args[1].Length > 1 ? double.Parse(args[1][1..]) : 0) : double.Parse(args[1]);
|
||||||
|
double y = args[2].StartsWith('~') ? current.Y + (args[2].Length > 1 ? double.Parse(args[2][1..]) : 0) : double.Parse(args[2]);
|
||||||
|
double z = args[3].StartsWith('~') ? current.Z + (args[3].Length > 1 ? double.Parse(args[3][1..]) : 0) : double.Parse(args[3]);
|
||||||
|
|
||||||
|
Location block = new Location(x, y, z).ToFloor(), blockCenter = block.ToCenter();
|
||||||
|
|
||||||
|
if (!handler.GetWorld().GetBlock(block).Type.IsBed())
|
||||||
|
return Translations.TryGet("cmd.bed.not_a_bed", blockCenter.X, blockCenter.Y, blockCenter.Z);
|
||||||
|
|
||||||
|
bool res = handler.PlaceBlock(block, Direction.Down);
|
||||||
|
|
||||||
|
return Translations.TryGet(
|
||||||
|
"cmd.bed.trying_to_use",
|
||||||
|
blockCenter.X,
|
||||||
|
blockCenter.Y,
|
||||||
|
blockCenter.Z,
|
||||||
|
Translations.TryGet(res ? "cmd.bed.in" : "cmd.bed.not_in")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return CmdUsage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -752,6 +752,7 @@ namespace MinecraftClient.Mapping
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Check if the provided material is a liquid a player can swim into
|
/// Check if the provided material is a liquid a player can swim into
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -768,5 +769,36 @@ namespace MinecraftClient.Mapping
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Check if the provided material is a bed
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="m">Material to test</param>
|
||||||
|
/// <returns>True if the material is a bed</returns>
|
||||||
|
public static bool IsBed(this Material m)
|
||||||
|
{
|
||||||
|
switch (m)
|
||||||
|
{
|
||||||
|
case Material.BlackBed:
|
||||||
|
case Material.BlueBed:
|
||||||
|
case Material.BrownBed:
|
||||||
|
case Material.CyanBed:
|
||||||
|
case Material.GrayBed:
|
||||||
|
case Material.GreenBed:
|
||||||
|
case Material.LightBlueBed:
|
||||||
|
case Material.LightGrayBed:
|
||||||
|
case Material.LimeBed:
|
||||||
|
case Material.MagentaBed:
|
||||||
|
case Material.OrangeBed:
|
||||||
|
case Material.PinkBed:
|
||||||
|
case Material.PurpleBed:
|
||||||
|
case Material.RedBed:
|
||||||
|
case Material.WhiteBed:
|
||||||
|
case Material.YellowBed:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -344,6 +344,20 @@ cmd.inventory.help.unknown=Unknown action.
|
||||||
cmd.inventory.found_items=Found items
|
cmd.inventory.found_items=Found items
|
||||||
cmd.inventory.no_found_items=Could not find the specified item in any of avaliable Inventories!
|
cmd.inventory.no_found_items=Could not find the specified item in any of avaliable Inventories!
|
||||||
|
|
||||||
|
# Leave bed
|
||||||
|
cmd.bed.desc=Used to sleep in or leave a bed.
|
||||||
|
cmd.bed.leaving=Sending a command to leave a bed to the server.
|
||||||
|
cmd.bed.trying_to_use=Trying to sleep in a bed on location (X: {0:0.0}, Y: {1:0.0}, Z: {2:0.0}). Result: {3}
|
||||||
|
cmd.bed.in=Succesfully laid in bed!
|
||||||
|
cmd.bed.not_in=Could not lay in bed. Are you trying to sleep in a bed? (PS: You must use the head block coordinates of the bed)
|
||||||
|
cmd.bed.not_a_bed=The block on (X: {0:0.0}, Y: {1:0.0}, Z: {2:0.0}) is not a bed!
|
||||||
|
cmd.bed.searching=Searching for a bed in radius of {0}...
|
||||||
|
cmd.bed.bed_not_found=Could not find a bed!
|
||||||
|
cmd.bed.found_a_bed_at=Found a bet at (X: {0:0.0}, Y: {1:0.0}, Z: {2:0.0}).
|
||||||
|
cmd.bed.cant_reach_safely=Can not reach the bed safely!
|
||||||
|
cmd.bed.moving=Moving to (X: {0:0.0}, Y: {1:0.0}, Z: {2:0.0}) where the bed is located.
|
||||||
|
cmd.bed.failed_to_reach_in_time=Failed to reach the bed position (X: {0:0.0}, Y: {1:0.0}, Z: {2:0.0}) in time (30 seconds). Giving up!
|
||||||
|
|
||||||
# List
|
# List
|
||||||
cmd.list.desc=get the player list.
|
cmd.list.desc=get the player list.
|
||||||
cmd.list.players=PlayerList: {0}
|
cmd.list.players=PlayerList: {0}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue