|
@@ -62,8 +62,10 @@ command.register("cli", "Clears items in a radius");
|
|
|
command.register("color", "Shows all colors");
|
|
|
command.register("coords", "Shows infos for the targeted block");
|
|
|
command.register("copyisland", "Copyisland-Commands");
|
|
|
+command.register("creative", "Teleports to creative-spawn");
|
|
|
command.register("databank", "Databank-Commands");
|
|
|
command.register("datatools", "Datatools-Commands");
|
|
|
+command.register("enchant", "Enchants an item in your hand");
|
|
|
command.register("enderchest", "Shows enderchests");
|
|
|
command.register("error", "Error-Logger");
|
|
|
command.register("errordebug", "Debug-Logger");
|
|
@@ -88,6 +90,7 @@ command.register("human", "Human-Commands");
|
|
|
command.register("inv", "Inv-Commands");
|
|
|
command.register("iteminfo", "Returns information about an item");
|
|
|
command.register("jail", "Sends a player to jail");
|
|
|
+command.register("jumpto", "Jumps to a block in sight");
|
|
|
command.register("kick", "Kicks a player");
|
|
|
command.register("lastseen", "Shows the last players online");
|
|
|
command.register("lightning", "Summons a lightning_bolt");
|
|
@@ -169,6 +172,7 @@ command.registerAlias("sban", "silentban");
|
|
|
command.registerAlias("tell", "msg");
|
|
|
command.registerAlias("r", "answer");
|
|
|
command.registerAlias("pardon", "unban");
|
|
|
+command.registerAlias("j", "jumpto");
|
|
|
command.registerAlias("mimimi", "help");
|
|
|
command.registerAlias("ci", "copyisland");
|
|
|
command.registerAlias("mem", "memory");
|
|
@@ -322,6 +326,8 @@ set.add(butcher_set, "drowned");
|
|
|
set.add(butcher_set, "wither");
|
|
|
set.add(butcher_set, "silverfish");
|
|
|
set.add(butcher_set, "zombified_piglin");
|
|
|
+set.add(butcher_set, "cod");
|
|
|
+set.add(butcher_set, "guardian");
|
|
|
|
|
|
rank_array = array.new(25, 2);
|
|
|
//Playtime
|
|
@@ -1464,7 +1470,7 @@ a = list.getIndex(lag_list, 0);
|
|
|
list.removeIndex(lag_list, 0);
|
|
|
p_uuid = a[0];
|
|
|
t_old = a[1];
|
|
|
-t = math.roundComma((t - t_old) / 5000 * 20, 2); //Umwandlung 5000ms -> 1s -> 20ticks
|
|
|
+t = math.roundComma((t - t_old) / 50 / 5, 2);
|
|
|
p = player.get(p_uuid);
|
|
|
if(p != null) {
|
|
|
msg.prefix(p, prefix_commands, "Expected: 20 ticks/sec");
|
|
@@ -2159,6 +2165,20 @@ if(silentjoin) {
|
|
|
}
|
|
|
goto("wait");
|
|
|
|
|
|
+@jumpto
|
|
|
+loc = player.getTarget(player, 100);
|
|
|
+if(block.isAir(loc)) {
|
|
|
+ msg.prefix(player, prefix_commands, "No block in sight.");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+y = loc.getY(loc);
|
|
|
+while(!block.isAir(loc)) {
|
|
|
+ loc.setY(loc, y);
|
|
|
+ y++;
|
|
|
+}
|
|
|
+player.teleport(player, loc.mod(loc, 0, 1, 0), true);
|
|
|
+goto("wait");
|
|
|
+
|
|
|
@jailloop
|
|
|
size = list.getSize(jailed_list);
|
|
|
for(i = 0; i < size; i++) {
|
|
@@ -2884,10 +2904,10 @@ if(text.contains(tipp_value, "https://")) {
|
|
|
msg_before = a[0];
|
|
|
msg_link = a[1];
|
|
|
msg_after = a[2];
|
|
|
- msg(p, concat("§r[", prefix_tips, "§r] "), msg_before, msg_link, msg_after);
|
|
|
+ msg(p, concat("§r[§e", player.getName(player), "§r] "), msg_before, msg_link, msg_after);
|
|
|
goto("wait");
|
|
|
}
|
|
|
-msg(p, concat("§r[", prefix_tips, "§r] ", tipp_value));
|
|
|
+msg(p, concat("§r[§e", player.getName(player), "§r] ", tipp_value));
|
|
|
goto("wait");
|
|
|
|
|
|
@help
|
|
@@ -3137,7 +3157,7 @@ elseif(arg0 == "harvest") {
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.startNamed("Harvest", "utils/u_error", "system/harvest", "utils/u_general");
|
|
|
+ script.startNamed("Harvest", "utils/u_error", "survival/harvest", "utils/u_general");
|
|
|
}
|
|
|
elseif(arg0 == "hawkeye") {
|
|
|
script = script.get("Hawkeye");
|
|
@@ -3151,21 +3171,21 @@ elseif(arg0 == "herobrine") {
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.startNamed("Herobrine", "utils/u_error", "system/herobrine", "utils/u_general");
|
|
|
+ script.startNamed("Herobrine", "utils/u_error", "survival/herobrine", "utils/u_general");
|
|
|
}
|
|
|
elseif(arg0 == "lectern") {
|
|
|
script = script.get("Lectern");
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.startNamed("Lectern", "utils/u_error", "system/lectern", "utils/u_general");
|
|
|
+ script.startNamed("Lectern", "utils/u_error", "survival/lectern", "utils/u_general");
|
|
|
}
|
|
|
elseif(arg0 == "loom") {
|
|
|
script = script.get("Loom");
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.startNamed("Loom", "utils/u_error", "system/loom", "utils/u_general");
|
|
|
+ script.startNamed("Loom", "utils/u_error", "survival/loom", "utils/u_general");
|
|
|
}
|
|
|
elseif(arg0 == "perms") {
|
|
|
script.start("system/perms", "utils/u_general");
|
|
@@ -3175,7 +3195,7 @@ elseif(arg0 == "pumpkin") {
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.startNamed("Pumpkin", "utils/u_error", "system/pumpkin", "utils/u_general");
|
|
|
+ script.startNamed("Pumpkin", "utils/u_error", "survival/pumpkin", "utils/u_general");
|
|
|
}
|
|
|
elseif(arg0 == "stats") {
|
|
|
script = script.get("Ranklist");
|
|
@@ -3217,7 +3237,7 @@ elseif(arg0 == "timber") {
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.startNamed("Timber", "utils/u_error", "system/timber", "utils/u_general");
|
|
|
+ script.startNamed("Timber", "utils/u_error", "survival/timber", "utils/u_general");
|
|
|
}
|
|
|
elseif(arg0 == "trader") {
|
|
|
script = script.get("Trader");
|
|
@@ -3231,7 +3251,7 @@ elseif(arg0 == "story") {
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.startNamed("Story", "utils/u_error", "system/story", "utils/u_general");
|
|
|
+ script.startNamed("Story", "utils/u_error", "story/story", "utils/u_general");
|
|
|
script = script.get("QuestsAdmont");
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
@@ -3255,7 +3275,7 @@ elseif(arg0 == "survival") {
|
|
|
if(script != null) {
|
|
|
script.term(script);
|
|
|
}
|
|
|
- script.startNamed("Survival", "utils/u_error", "system/survival", "utils/u_general");
|
|
|
+ script.startNamed("Survival", "utils/u_error", "survival/survival", "utils/u_general");
|
|
|
}
|
|
|
elseif(arg0 == "voxel") {
|
|
|
script = script.get("Voxel");
|
|
@@ -3306,6 +3326,48 @@ while(block.isAir(player_loc)) {
|
|
|
player.teleport(player, loc.mod(player_loc, 0, 1, 0), true);
|
|
|
goto("wait");
|
|
|
|
|
|
+@creative
|
|
|
+crea_spawn = world.getCreativeSpawn();
|
|
|
+world = loc.getWorld(crea_spawn);
|
|
|
+if(world == null) {
|
|
|
+ msg.prefix(player, prefix_commands, "This world is not loaded.");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+if(size > 1) {
|
|
|
+ msg.prefix(player, prefix_commands, "/story [player]");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+if(size == 1) {
|
|
|
+ affectedname = list.getIndex(args, 0);
|
|
|
+ affectedplayer = read.player(affectedname);
|
|
|
+ if(affectedplayer == null) {
|
|
|
+ msg.prefix(player, prefix_commands, "This player is not online.");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ if(!perm.has(player, "teleport.other")) {
|
|
|
+ perm.no(player, "teleport.other");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+}
|
|
|
+if(player.hasMinigame(affectedplayer)) {
|
|
|
+ if(size == 1) {
|
|
|
+ msg.prefix(player, prefix_commands, "The player can't be teleported now.");
|
|
|
+ } else {
|
|
|
+ msg.prefix(player, prefix_commands, "You can't teleport now.");
|
|
|
+ }
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+if(size == 1) {
|
|
|
+ if(player != affectedplayer) {
|
|
|
+ affectedname = player.getName(affectedplayer);
|
|
|
+ msg.prefix(player, prefix_commands, concat(affectedname, " was teleported to the creative world."));
|
|
|
+ }
|
|
|
+}
|
|
|
+if(player.teleport(affectedplayer, crea_spawn, true)) {
|
|
|
+ msg.prefix(affectedplayer, prefix_commands, "You have been teleported to the creative world.");
|
|
|
+}
|
|
|
+goto("wait");
|
|
|
+
|
|
|
@story
|
|
|
story_spawn = world.getStorySpawn();
|
|
|
world = loc.getWorld(story_spawn);
|
|
@@ -3645,6 +3707,7 @@ if(size == 0) {
|
|
|
msg(player, "§6 - name-visibility <boolean> §rShow name (not) permanent");
|
|
|
msg(player, "§6 - name-item <name> §rRename an item");
|
|
|
msg(player, "§6 - lore-item <line> <lore> §rSet an item lore");
|
|
|
+ msg(player, "§6 - print-entity §rPrint entities nbt-tag");
|
|
|
goto("wait");
|
|
|
}
|
|
|
arg0 = text.toLowerCase(list.getIndex(args, 0));
|
|
@@ -3719,6 +3782,17 @@ if(arg0 == "name-item") {
|
|
|
msg.prefix(player, prefix_datatools, concat("Item renamed to ", name, "§r."));
|
|
|
goto("wait");
|
|
|
}
|
|
|
+if(arg0 == "print-entity") {
|
|
|
+ templist = living.near(player, 3);
|
|
|
+ if(list.getSize(templist) == 0) {
|
|
|
+ msg.prefix(player, prefix_datatools, "Too far away from an entity.");
|
|
|
+ goto("wait");
|
|
|
+ }
|
|
|
+ entity = list.getIndex(templist, 0);
|
|
|
+ txt_ent = text.entity(entity);
|
|
|
+ msg(player, text.clipBoard(txt_ent, txt_ent));
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
if(arg0 == "lore-item") {
|
|
|
if(size < 3) {
|
|
|
msg.prefix(player, prefix_datatools, "/datatools lore-item <line> <lore>");
|
|
@@ -5788,6 +5862,30 @@ for(i = 0; i < size; i++) {
|
|
|
msg.prefix(player, prefix_commands, concat(text.number(killed), " mobs killed."));
|
|
|
goto("wait");
|
|
|
|
|
|
+@enchant
|
|
|
+if(size != 2) {
|
|
|
+ msg.prefix(player, prefix_commands, "/enchant <enchantment> <level>");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+ench_string = list.getIndex(args, 0);
|
|
|
+ench = enchantment.get(ench_string);
|
|
|
+if(ench == null) {
|
|
|
+ msg.prefix(player, prefix_commands, "Unknown enchantment");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+lvl = list.getIndex(args, 1);
|
|
|
+if(!isDouble(lvl) || lvl < 1 || lvl > 100) {
|
|
|
+ msg.prefix(sender, prefix_commands, "Number greater than 0 and less than 101 expected.");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+item = living.getHand(player);
|
|
|
+if(item.getType(item) == "minecraft:air") {
|
|
|
+ msg.prefix(sender, prefix_commands, "You need to hold an item in your hand.");
|
|
|
+ goto("wait");
|
|
|
+}
|
|
|
+enchantment.add(ench, item, lvl);
|
|
|
+goto("wait");
|
|
|
+
|
|
|
@enderchest
|
|
|
if(size < 1 || size > 2) {
|
|
|
msg.prefix(player, prefix_commands, "/enderchest [player] <from-player>");
|
|
@@ -6423,7 +6521,7 @@ if(!isDouble(amount)) {
|
|
|
goto("wait");
|
|
|
}
|
|
|
if(amount < 1) {
|
|
|
- msg.prefix(sender, prefix_commands, "Zahl größer 0 erwartet.");
|
|
|
+ msg.prefix(sender, prefix_commands, "Positive number expected.");
|
|
|
goto("wait");
|
|
|
}
|
|
|
msg.prefix(sender, prefix_commands, "These players were last seen:");
|
|
@@ -8102,6 +8200,7 @@ function addTpaRequest(player_uuid, aim_uuid) {
|
|
|
function setCommandHelps() {
|
|
|
command.clearHelp();
|
|
|
command.clearIgnored();
|
|
|
+ //Vanilla ignorieren, danach neu setzen
|
|
|
command.addIgnored("teleport");
|
|
|
command.addIgnored("time");
|
|
|
command.addIgnored("help");
|
|
@@ -8109,6 +8208,8 @@ function setCommandHelps() {
|
|
|
command.addIgnored("kick");
|
|
|
command.addIgnored("kill");
|
|
|
command.addIgnored("gamemode");
|
|
|
+ command.addIgnored("enchant");
|
|
|
+ command.addIgnored("jumpto");
|
|
|
|
|
|
commandhelp.add("silentjoin");
|
|
|
commandhelp.add("nowb");
|
|
@@ -8153,6 +8254,8 @@ function setCommandHelps() {
|
|
|
commandhelp.addAlias(help, "ram", "memory");
|
|
|
help = commandhelp.add("afk");
|
|
|
commandhelp.addAlias(help, "afklo", "afk");
|
|
|
+ help = commandhelp.add("jumpto");
|
|
|
+ commandhelp.addAlias(help, "j", "jumpto");
|
|
|
|
|
|
help = commandhelp.add("leave");
|
|
|
commandhelp.addAlias(help, "l", "leave");
|
|
@@ -8250,6 +8353,12 @@ function setCommandHelps() {
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
command.addHelp(help);
|
|
|
|
|
|
+ help = command.newHelp("enchant", "enchant");
|
|
|
+ helpArg0 = command.newHelpSpecial("Enchantment", "enchantment");
|
|
|
+ command.addHelpChild(helpArg0, command.newHelpInt("level", 0, 100));
|
|
|
+ command.addHelpChild(help, helpArg0);
|
|
|
+ command.addHelp(help);
|
|
|
+
|
|
|
help = command.newHelp("allsounds", "allsounds");
|
|
|
command.addHelpChild(help, command.newHelpLiteral("start"));
|
|
|
command.addHelpChild(help, command.newHelpLiteral("stop"));
|
|
@@ -8263,6 +8372,10 @@ function setCommandHelps() {
|
|
|
command.addHelpChild(help, command.newHelpSpecial("Player", "player", "teleport.other"));
|
|
|
command.addHelp(help);
|
|
|
|
|
|
+ help = command.newHelp("creative", "creative");
|
|
|
+ command.addHelpChild(help, command.newHelpSpecial("Player", "player", "teleport.other"));
|
|
|
+ command.addHelp(help);
|
|
|
+
|
|
|
help = command.newHelp("story", "story");
|
|
|
command.addHelpChild(help, command.newHelpSpecial("Player", "player", "teleport.other"));
|
|
|
command.addHelp(help);
|
|
@@ -8298,12 +8411,13 @@ function setCommandHelps() {
|
|
|
help = command.newHelp("stats", "stats");
|
|
|
addStatsGameHelp(help, "BedWars");
|
|
|
addStatsGameHelp(help, "RageMode");
|
|
|
- addStatsGameHelp(help, "Jump'n'Run");
|
|
|
+ addStatsGameHelp(help, "JR-Endless");
|
|
|
addStatsGameHelp(help, "Rebuild");
|
|
|
addStatsGameHelp(help, "FastBridge");
|
|
|
addStatsGameHelp(help, "SnowGame");
|
|
|
addStatsGameHelp(help, "TJR");
|
|
|
- addStatsGameHelp(help, "IJR");
|
|
|
+ addStatsGameHelp(help, "JR-Ice");
|
|
|
+ addStatsGameHelp(help, "JR-Rooms");
|
|
|
addStatsGameHelp(help, "Letters");
|
|
|
addStatsGameHelp(help, "Sammelfieber");
|
|
|
addStatsGameHelp(help, "Buttons");
|
|
@@ -8337,14 +8451,14 @@ function setCommandHelps() {
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
//datatools attribute <attribute> <slot> <double> <op>
|
|
|
helpArg0 = command.newHelpLiteral("attribute");
|
|
|
- command.addHelpChild(helpArg0, addDtAttributeAttributHelp("ARMOR"));
|
|
|
- command.addHelpChild(helpArg0, addDtAttributeAttributHelp("ARMOR_TOUGHNESS"));
|
|
|
- command.addHelpChild(helpArg0, addDtAttributeAttributHelp("ATTACK_DAMAGE"));
|
|
|
- command.addHelpChild(helpArg0, addDtAttributeAttributHelp("KNOCKBACK_RESISTANCE"));
|
|
|
- command.addHelpChild(helpArg0, addDtAttributeAttributHelp("MAX_HEALTH"));
|
|
|
- command.addHelpChild(helpArg0, addDtAttributeAttributHelp("MOVEMENT_SPEED"));
|
|
|
- command.addHelpChild(helpArg0, addDtAttributeAttributHelp("ATTACK_SPEED"));
|
|
|
- command.addHelpChild(helpArg0, addDtAttributeAttributHelp("LUCK"));
|
|
|
+ command.addHelpChild(helpArg0, addDtAttributeAttributHelp("armor"));
|
|
|
+ command.addHelpChild(helpArg0, addDtAttributeAttributHelp("armor_toughness"));
|
|
|
+ command.addHelpChild(helpArg0, addDtAttributeAttributHelp("attack_damage"));
|
|
|
+ command.addHelpChild(helpArg0, addDtAttributeAttributHelp("knockback_resistance"));
|
|
|
+ command.addHelpChild(helpArg0, addDtAttributeAttributHelp("max_health"));
|
|
|
+ command.addHelpChild(helpArg0, addDtAttributeAttributHelp("movement_speed"));
|
|
|
+ command.addHelpChild(helpArg0, addDtAttributeAttributHelp("attack_speed"));
|
|
|
+ command.addHelpChild(helpArg0, addDtAttributeAttributHelp("luck"));
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
//datatools hide-entity
|
|
|
command.addHelpChild(help, command.newHelpLiteral("hide-entity"));
|
|
@@ -8364,6 +8478,8 @@ function setCommandHelps() {
|
|
|
helpArg1 = command.newHelpString("name", true);
|
|
|
command.addHelpChild(helpArg0, helpArg1);
|
|
|
command.addHelpChild(help, helpArg0);
|
|
|
+ //datatools print-entity
|
|
|
+ command.addHelpChild(help, command.newHelpLiteral("print-entity"));
|
|
|
//datatools lore-item <line> <lore>
|
|
|
helpArg0 = command.newHelpLiteral("lore-item");
|
|
|
helpArg1 = command.newHelpInt("line", 0, 1000);
|