mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity
CC-Tweaked/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java

419 lines
19 KiB
Java
Raw Normal View History

Happy new year!
2019-01-01 01:10:18 +00:00
/*
* This file is part of ComputerCraft - http://www.computercraft.info
Happy new year Should be the last time I'll have to do this!
2022-01-01 00:07:26 +00:00
* Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
Happy new year!
2019-01-01 01:10:18 +00:00
* Send enquiries to dratcliffe@gmail.com
*/
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
package dan200.computercraft.shared.command;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
Several command permission fixes - Attach permission checks to the first argument (so the literal command name) rather than the last argument. This fixes commands showing up when they shouldn't. - HelpingArgumentBuilder now inherits permissions of its leaf nodes. This only really impacts the "track" subcommand. - Don't autocomplete the computer selector for the "queue" subcommand. As everyone has permission for this command, it's possible to find all computer ids and labels in the world. I'm in mixed minds about this, but don't think this is an exploit - computer ids/labels are sent to in-range players so shouldn't be considered secret - but worth patching none-the-less.
2023-07-06 22:41:02 +00:00
import com.mojang.brigadier.builder.RequiredArgumentBuilder;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import com.mojang.brigadier.exceptions.CommandSyntaxException;
Several command permission fixes - Attach permission checks to the first argument (so the literal command name) rather than the last argument. This fixes commands showing up when they shouldn't. - HelpingArgumentBuilder now inherits permissions of its leaf nodes. This only really impacts the "track" subcommand. - Don't autocomplete the computer selector for the "queue" subcommand. As everyone has permission for this command, it's possible to find all computer ids and labels in the world. I'm in mixed minds about this, but don't think this is an exploit - computer ids/labels are sent to in-range players so shouldn't be considered secret - but worth patching none-the-less.
2023-07-06 22:41:02 +00:00
import com.mojang.brigadier.suggestion.Suggestions;
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
import dan200.computercraft.api.peripheral.IPeripheral;
Convert computer sides to an enum Previously we just relied on magic int values, which was confusing and potentially error-prone. We could use EnumFacing, but that's a) dependent on MC and b) incorrect, as we're referring to local coordinates.
2019-04-09 09:02:54 +00:00
import dan200.computercraft.core.computer.ComputerSide;
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
import dan200.computercraft.core.metrics.Metrics;
Several command permission fixes - Attach permission checks to the first argument (so the literal command name) rather than the last argument. This fixes commands showing up when they shouldn't. - HelpingArgumentBuilder now inherits permissions of its leaf nodes. This only really impacts the "track" subcommand. - Don't autocomplete the computer selector for the "queue" subcommand. As everyone has permission for this command, it's possible to find all computer ids and labels in the world. I'm in mixed minds about this, but don't think this is an exploit - computer ids/labels are sent to in-range players so shouldn't be considered secret - but worth patching none-the-less.
2023-07-06 22:41:02 +00:00
import dan200.computercraft.shared.command.arguments.ComputersArgumentType;
Move from FMLEventChannel to SimpleNetworkWrapper - Split each network packet into it's own individual IMessage class. - Move the TextTable into separate classes for server and client based rendering.
2018-12-29 12:18:05 +00:00
import dan200.computercraft.shared.command.text.TableBuilder;
Move the /computer command into the main computercraft command I don't think anyone has actually ended up using this, so it's unlikely to break anything (though do tell me if this is the case). On the flip side, this allows us to queue events on multiple computers, and means we can provide a little more documentation.
2018-11-29 11:57:52 +00:00
import dan200.computercraft.shared.computer.core.ComputerFamily;
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
import dan200.computercraft.shared.computer.core.ServerComputer;
Start work on curtailing our global state The last 4 or 5 commits have simplified things. I can now have some unnecessary complexity as a treat! This is some initial work on better tying the lifecycle of computers (and ComputerCraft) related state to the lifecycle of the current Minecraft server. - Move server-wide methods in IComputerEnvironment (such as creating resource mounts) into a separate interface. - Add a new ServerContext class, which now holds the ID Assigner, server computer registry, and some other tiny bits and bobs. This can only be accessed by ServerContect.get(MinecraftServer), forcing slightly better discipline for how we use these globals. This does allow us to nuke some of the ugliest bits in IDAssigner. Even if it makes things much longer!
2022-10-21 20:01:01 +00:00
import dan200.computercraft.shared.computer.core.ServerContext;
Finish off containers, somewhat fix block drops - Add Forge's "name" field to the loot tables. This doesn't resolve all our missing loot providers, but it's a start. - Add back GUIs for pocket computers, printouts, view computer, etc...
2019-06-12 07:40:20 +00:00
import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
import dan200.computercraft.shared.computer.metrics.basic.Aggregate;
import dan200.computercraft.shared.computer.metrics.basic.AggregatedMetric;
import dan200.computercraft.shared.computer.metrics.basic.BasicComputerMetricsObserver;
import dan200.computercraft.shared.computer.metrics.basic.ComputerMetrics;
Remove ClientComputer Historically CC has maintained two computer registries; one on the server (which runs the actual computer) and one on the client (which stores the terminal and some small bits of additional data). This means when a user opens the computer UI, we send the terminal contents and store it in the client computer registry. We then send the instance id alongside the "open container" packet, which is used to look up the client computer (and thus terminal) in our client-side registry. This patch makes the computer menu syncing behaviour more consistent with vanilla. The initial terminal contents is sent alongside the "open container" packet, and subsequent terminal changes apply /just/ to the open container. Computer on/off state is synced via a vanilla ContainerData/IIntArray. Likewise, sending user input to the server now targets the open container, rather than an arbitrary instance id. The one remaining usage of ClientComputer is for pocket computers. For these, we still need to sync the current on/off/blinking state and the pocket computer light. We don't need the full ClientComputer interface for this case (after all, you can't send input to a pocket computer someone else is holding!). This means we can tear out ClientComputer and ClientComputerRegistry, replacing it with a much simpler ClientPocketComputers store. This in turn allows the following changes: - Remove IComputer, as we no longer need to abstract over client and server computers. - Likewise, we can merge ComputerRegistry into the server registry. This commit also cleans up the handling of instance IDs a little bit: ServerComputers are now responsible for generating their ID and adding/removing themselves from the registry. - As the client-side terminal will never be null, we can remove a whole bunch of null checks throughout the codebase. - As the terminal is available immediately, we don't need to explicitly pass in terminal sizes to the computer GUIs. This means we're no longer reliant on those config values on the client side! - Remove the "request computer state" packet. Pocket computers now store which players need to know the computer state, automatically sending data when a new player starts tracking the computer.
2022-10-21 17:17:42 +00:00
import dan200.computercraft.shared.network.container.ComputerContainerData;
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.MenuProvider;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
Merge branch 'mc-1.16.x' into mc-1.18.x
2022-10-30 08:49:52 +00:00
import net.minecraft.world.item.ItemStack;
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
import net.minecraft.world.level.Level;
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
import javax.annotation.Nonnull;
Add button to view computer's folder Implementation is a little awkward, as we can't send OPEN_FILE links from the server, so we ensure the client runs a /computercraft open-computer ID command instead. We then intercept this on the client side and use that to open the folder.
2021-05-28 21:19:04 +00:00
import java.io.File;
Add computer performance monitor
2018-02-02 13:34:27 +00:00
import java.util.*;
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import static dan200.computercraft.shared.command.CommandUtils.isPlayer;
import static dan200.computercraft.shared.command.Exceptions.*;
import static dan200.computercraft.shared.command.arguments.ComputerArgumentType.getComputerArgument;
import static dan200.computercraft.shared.command.arguments.ComputerArgumentType.oneComputer;
import static dan200.computercraft.shared.command.arguments.ComputersArgumentType.*;
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
import static dan200.computercraft.shared.command.arguments.TrackingFieldArgumentType.metric;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
import static dan200.computercraft.shared.command.builder.CommandBuilder.args;
import static dan200.computercraft.shared.command.builder.CommandBuilder.command;
import static dan200.computercraft.shared.command.builder.HelpingArgumentBuilder.choice;
Move from FMLEventChannel to SimpleNetworkWrapper - Split each network packet into it's own individual IMessage class. - Move the TextTable into separate classes for server and client based rendering.
2018-12-29 12:18:05 +00:00
import static dan200.computercraft.shared.command.text.ChatHelpers.*;
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
import static net.minecraft.commands.Commands.literal;
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
public final class CommandComputerCraft
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
public static final UUID SYSTEM_UUID = new UUID( 0, 0 );
Delete previous chat messages of the same type This uses a custom ComputerCraft packet to send chat messages to the client. When received, we delete all messages of the same category before sending the new ones. This avoids cluttering the chat with near-identical messages, and helps make working with the "individual dump" command easier, as the previous computer's dump output is deleted. Also change the max height of the TextTable to 18, so it fits within Minecraft's default chat limit.
2018-05-15 10:44:23 +00:00
private static final int DUMP_LIST_ID = 5373952;
private static final int DUMP_SINGLE_ID = 1844510720;
private static final int TRACK_ID = 373882880;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
private CommandComputerCraft()
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
}
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
public static void register( CommandDispatcher<CommandSourceStack> dispatcher )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
dispatcher.register( choice( "computercraft" )
.then( literal( "dump" )
.requires( UserLevel.OWNER_OP )
.executes( context -> {
Move from FMLEventChannel to SimpleNetworkWrapper - Split each network packet into it's own individual IMessage class. - Move the TextTable into separate classes for server and client based rendering.
2018-12-29 12:18:05 +00:00
TableBuilder table = new TableBuilder( DUMP_LIST_ID, "Computer", "On", "Position" );
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
CommandSourceStack source = context.getSource();
Start work on curtailing our global state The last 4 or 5 commits have simplified things. I can now have some unnecessary complexity as a treat! This is some initial work on better tying the lifecycle of computers (and ComputerCraft) related state to the lifecycle of the current Minecraft server. - Move server-wide methods in IComputerEnvironment (such as creating resource mounts) into a separate interface. - Add a new ServerContext class, which now holds the ID Assigner, server computer registry, and some other tiny bits and bobs. This can only be accessed by ServerContect.get(MinecraftServer), forcing slightly better discipline for how we use these globals. This does allow us to nuke some of the ugliest bits in IDAssigner. Even if it makes things much longer!
2022-10-21 20:01:01 +00:00
List<ServerComputer> computers = new ArrayList<>( ServerContext.get( source.getServer() ).registry().getComputers() );
Prevent computer dump command sending too much information
2018-01-20 11:07:09 +00:00
// Unless we're on a server, limit the number of rows we can send.
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
Level world = source.getLevel();
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
BlockPos pos = new BlockPos( source.getPosition() );
Prevent computer dump command sending too much information
2018-01-20 11:07:09 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
computers.sort( ( a, b ) -> {
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
if( a.getLevel() == b.getLevel() && a.getLevel() == world )
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
{
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
return Double.compare( a.getPosition().distSqr( pos ), b.getPosition().distSqr( pos ) );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
}
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
else if( a.getLevel() == world )
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
{
return -1;
}
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
else if( b.getLevel() == world )
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
{
return 1;
}
else
{
return Integer.compare( a.getInstanceID(), b.getInstanceID() );
}
} );
Prevent computer dump command sending too much information
2018-01-20 11:07:09 +00:00
for( ServerComputer computer : computers )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Move from FMLEventChannel to SimpleNetworkWrapper - Split each network packet into it's own individual IMessage class. - Move the TextTable into separate classes for server and client based rendering.
2018-12-29 12:18:05 +00:00
table.row(
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
linkComputer( source, computer, computer.getID() ),
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
bool( computer.isOn() ),
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
linkPosition( source, computer )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
);
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
table.display( context.getSource() );
return computers.size();
} )
.then( args()
.arg( "computer", oneComputer() )
.executes( context -> {
ServerComputer computer = getComputerArgument( context, "computer" );
TableBuilder table = new TableBuilder( DUMP_SINGLE_ID );
table.row( header( "Instance" ), text( Integer.toString( computer.getInstanceID() ) ) );
table.row( header( "Id" ), text( Integer.toString( computer.getID() ) ) );
table.row( header( "Label" ), text( computer.getLabel() ) );
table.row( header( "On" ), bool( computer.isOn() ) );
table.row( header( "Position" ), linkPosition( context.getSource(), computer ) );
table.row( header( "Family" ), text( computer.getFamily().toString() ) );
Merge branch 'master' into mc-1.13.x
2019-04-09 10:11:12 +00:00
for( ComputerSide side : ComputerSide.values() )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Merge branch 'master' into mc-1.13.x
2019-04-09 10:11:12 +00:00
IPeripheral peripheral = computer.getPeripheral( side );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
if( peripheral != null )
{
Merge branch 'master' into mc-1.13.x
2019-04-09 10:11:12 +00:00
table.row( header( "Peripheral " + side.getName() ), text( peripheral.getType() ) );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
}
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
table.display( context.getSource() );
return 1;
} ) ) )
.then( command( "shutdown" )
.requires( UserLevel.OWNER_OP )
Start work on curtailing our global state The last 4 or 5 commits have simplified things. I can now have some unnecessary complexity as a treat! This is some initial work on better tying the lifecycle of computers (and ComputerCraft) related state to the lifecycle of the current Minecraft server. - Move server-wide methods in IComputerEnvironment (such as creating resource mounts) into a separate interface. - Add a new ServerContext class, which now holds the ID Assigner, server computer registry, and some other tiny bits and bobs. This can only be accessed by ServerContect.get(MinecraftServer), forcing slightly better discipline for how we use these globals. This does allow us to nuke some of the ugliest bits in IDAssigner. Even if it makes things much longer!
2022-10-21 20:01:01 +00:00
.argManyValue( "computers", manyComputers(), s -> ServerContext.get( s.getServer() ).registry().getComputers() )
Fix counts in /computercraft {turn-on,shutdown} We were using the size of the selectors (which is normally 1) rather than the number of computers.
2022-05-07 19:15:29 +00:00
.executes( ( context, computerSelectors ) -> {
Error when missing computers after executing the command This allows you to automate running various commands and still have them "work" if some computers are not loaded. Closes #47
2018-08-04 09:39:44 +00:00
int shutdown = 0;
Fix counts in /computercraft {turn-on,shutdown} We were using the size of the selectors (which is normally 1) rather than the number of computers.
2022-05-07 19:15:29 +00:00
Set<ServerComputer> computers = unwrap( context.getSource(), computerSelectors );
for( ServerComputer computer : computers )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Error when missing computers after executing the command This allows you to automate running various commands and still have them "work" if some computers are not loaded. Closes #47
2018-08-04 09:39:44 +00:00
if( computer.isOn() ) shutdown++;
Shutdown computers in /computercraft shutdown Unloading them now means they'll never be turned on again, which is a little unideal.
2019-02-27 13:47:50 +00:00
computer.shutdown();
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
}
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
context.getSource().sendSuccess( translate( "commands.computercraft.shutdown.done", shutdown, computers.size() ), false );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
return shutdown;
} ) )
.then( command( "turn-on" )
.requires( UserLevel.OWNER_OP )
Start work on curtailing our global state The last 4 or 5 commits have simplified things. I can now have some unnecessary complexity as a treat! This is some initial work on better tying the lifecycle of computers (and ComputerCraft) related state to the lifecycle of the current Minecraft server. - Move server-wide methods in IComputerEnvironment (such as creating resource mounts) into a separate interface. - Add a new ServerContext class, which now holds the ID Assigner, server computer registry, and some other tiny bits and bobs. This can only be accessed by ServerContect.get(MinecraftServer), forcing slightly better discipline for how we use these globals. This does allow us to nuke some of the ugliest bits in IDAssigner. Even if it makes things much longer!
2022-10-21 20:01:01 +00:00
.argManyValue( "computers", manyComputers(), s -> ServerContext.get( s.getServer() ).registry().getComputers() )
Fix counts in /computercraft {turn-on,shutdown} We were using the size of the selectors (which is normally 1) rather than the number of computers.
2022-05-07 19:15:29 +00:00
.executes( ( context, computerSelectors ) -> {
Error when missing computers after executing the command This allows you to automate running various commands and still have them "work" if some computers are not loaded. Closes #47
2018-08-04 09:39:44 +00:00
int on = 0;
Fix counts in /computercraft {turn-on,shutdown} We were using the size of the selectors (which is normally 1) rather than the number of computers.
2022-05-07 19:15:29 +00:00
Set<ServerComputer> computers = unwrap( context.getSource(), computerSelectors );
for( ServerComputer computer : computers )
Various improvements to command system - Ensure usage is consistent - Allow computer selectors to return multiple values - Fix commands being marked as usable when it isn't - Add /computercraft turn-on, a counter to /computercraft shutdown
2018-02-13 11:45:13 +00:00
{
Error when missing computers after executing the command This allows you to automate running various commands and still have them "work" if some computers are not loaded. Closes #47
2018-08-04 09:39:44 +00:00
if( !computer.isOn() ) on++;
computer.turnOn();
Various improvements to command system - Ensure usage is consistent - Allow computer selectors to return multiple values - Fix commands being marked as usable when it isn't - Add /computercraft turn-on, a counter to /computercraft shutdown
2018-02-13 11:45:13 +00:00
}
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
context.getSource().sendSuccess( translate( "commands.computercraft.turn_on.done", on, computers.size() ), false );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
return on;
} ) )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
.then( command( "tp" )
.requires( UserLevel.OP )
.arg( "computer", oneComputer() )
.executes( context -> {
ServerComputer computer = getComputerArgument( context, "computer" );
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
Level world = computer.getLevel();
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
BlockPos pos = computer.getPosition();
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
if( world == null || pos == null ) throw TP_NOT_THERE.create();
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
Entity entity = context.getSource().getEntityOrException();
Start using Java's instanceof pattern matching Well, not really pattern matching, but it's still an improvement!
2021-08-08 11:44:56 +00:00
if( !(entity instanceof ServerPlayer player) ) throw TP_NOT_PLAYER.create();
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
if( player.getCommandSenderWorld() == world )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
player.connection.teleport(
Initial update to 1.14 So very little works, but it compiles and runs. Things to resolve over the next few days: - Horrible mappings (should largely be resolved by tomorrow). - Cannot send extra data over containers - we'll have to see what Forge does here. - Turtle models are broken - No block drops yet - this will largely be cherry-picking whatever I did on Fabric. - Weird inventory desyncs (items don't show up initially when interacting with a CC inventory). - Probably lots of other things.
2019-06-08 12:36:31 +00:00
pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0,
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
EnumSet.noneOf( ClientboundPlayerPositionPacket.RelativeArgument.class )
Initial update to 1.14 So very little works, but it compiles and runs. Things to resolve over the next few days: - Horrible mappings (should largely be resolved by tomorrow). - Cannot send extra data over containers - we'll have to see what Forge does here. - Turtle models are broken - No block drops yet - this will largely be cherry-picking whatever I did on Fabric. - Weird inventory desyncs (items don't show up initially when interacting with a CC inventory). - Probably lots of other things.
2019-06-08 12:36:31 +00:00
);
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
else
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
player.teleportTo( (ServerLevel) world,
Initial update to 1.14 So very little works, but it compiles and runs. Things to resolve over the next few days: - Horrible mappings (should largely be resolved by tomorrow). - Cannot send extra data over containers - we'll have to see what Forge does here. - Turtle models are broken - No block drops yet - this will largely be cherry-picking whatever I did on Fabric. - Weird inventory desyncs (items don't show up initially when interacting with a CC inventory). - Probably lots of other things.
2019-06-08 12:36:31 +00:00
pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0
);
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
return 1;
} ) )
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
.then( command( "queue" )
.requires( UserLevel.ANYONE )
Several command permission fixes - Attach permission checks to the first argument (so the literal command name) rather than the last argument. This fixes commands showing up when they shouldn't. - HelpingArgumentBuilder now inherits permissions of its leaf nodes. This only really impacts the "track" subcommand. - Don't autocomplete the computer selector for the "queue" subcommand. As everyone has permission for this command, it's possible to find all computer ids and labels in the world. I'm in mixed minds about this, but don't think this is an exploit - computer ids/labels are sent to in-range players so shouldn't be considered secret - but worth patching none-the-less.
2023-07-06 22:41:02 +00:00
.arg(
Merge branch 'mc-1.16.x' into mc-1.18.x
2023-07-06 23:02:42 +00:00
RequiredArgumentBuilder.<CommandSourceStack, ComputersArgumentType.ComputersSupplier>argument( "computer", manyComputers() )
Several command permission fixes - Attach permission checks to the first argument (so the literal command name) rather than the last argument. This fixes commands showing up when they shouldn't. - HelpingArgumentBuilder now inherits permissions of its leaf nodes. This only really impacts the "track" subcommand. - Don't autocomplete the computer selector for the "queue" subcommand. As everyone has permission for this command, it's possible to find all computer ids and labels in the world. I'm in mixed minds about this, but don't think this is an exploit - computer ids/labels are sent to in-range players so shouldn't be considered secret - but worth patching none-the-less.
2023-07-06 22:41:02 +00:00
.suggests( ( context, builder ) -> Suggestions.empty() )
)
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
.argManyValue( "args", StringArgumentType.string(), Collections.emptyList() )
.executes( ( ctx, args ) -> {
Collection<ServerComputer> computers = getComputersArgument( ctx, "computer" );
Object[] rest = args.toArray();
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
int queued = 0;
for( ServerComputer computer : computers )
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
{
Normalise enums to use SHOUTY_CASE PascalCase is more .NET than Java
2020-01-28 22:28:48 +00:00
if( computer.getFamily() == ComputerFamily.COMMAND && computer.isOn() )
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
{
computer.queueEvent( "computer_command", rest );
queued++;
}
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
return queued;
} ) )
.then( command( "view" )
.requires( UserLevel.OP )
.arg( "computer", oneComputer() )
.executes( context -> {
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
ServerPlayer player = context.getSource().getPlayerOrException();
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
ServerComputer computer = getComputerArgument( context, "computer" );
Merge branch 'mc-1.16.x' into mc-1.18.x
2022-10-30 08:49:52 +00:00
new ComputerContainerData( computer, ItemStack.EMPTY ).open( player, new MenuProvider()
Finish off containers, somewhat fix block drops - Add Forge's "name" field to the loot tables. This doesn't resolve all our missing loot providers, but it's a start. - Add back GUIs for pocket computers, printouts, view computer, etc...
2019-06-12 07:40:20 +00:00
{
@Nonnull
@Override
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
public Component getDisplayName()
Finish off containers, somewhat fix block drops - Add Forge's "name" field to the loot tables. This doesn't resolve all our missing loot providers, but it's a start. - Add back GUIs for pocket computers, printouts, view computer, etc...
2019-06-12 07:40:20 +00:00
{
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
return new TranslatableComponent( "gui.computercraft.view_computer" );
Finish off containers, somewhat fix block drops - Add Forge's "name" field to the loot tables. This doesn't resolve all our missing loot providers, but it's a start. - Add back GUIs for pocket computers, printouts, view computer, etc...
2019-06-12 07:40:20 +00:00
}
@Nonnull
@Override
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
public AbstractContainerMenu createMenu( int id, @Nonnull Inventory player, @Nonnull Player entity )
Finish off containers, somewhat fix block drops - Add Forge's "name" field to the loot tables. This doesn't resolve all our missing loot providers, but it's a start. - Add back GUIs for pocket computers, printouts, view computer, etc...
2019-06-12 07:40:20 +00:00
{
Add invisible slots to computer GUIs This ensures inventory slots are synced while the container is open, meaning the hotbar (which is visible underneath the GUI) correctly updates. Fixes #915
2021-09-19 10:18:24 +00:00
return new ContainerViewComputer( id, player, computer );
Finish off containers, somewhat fix block drops - Add Forge's "name" field to the loot tables. This doesn't resolve all our missing loot providers, but it's a start. - Add back GUIs for pocket computers, printouts, view computer, etc...
2019-06-12 07:40:20 +00:00
}
} );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
return 1;
} ) )
.then( choice( "track" )
.then( command( "start" )
.requires( UserLevel.OWNER_OP )
.executes( context -> {
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
getMetricsInstance( context.getSource() ).start();
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
String stopCommand = "/computercraft track stop";
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
context.getSource().sendSuccess( translate( "commands.computercraft.track.start.stop",
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
link( text( stopCommand ), stopCommand, translate( "commands.computercraft.track.stop.action" ) ) ), false );
return 1;
} ) )
.then( command( "stop" )
.requires( UserLevel.OWNER_OP )
.executes( context -> {
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
BasicComputerMetricsObserver timings = getMetricsInstance( context.getSource() );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
if( !timings.stop() ) throw NOT_TRACKING_EXCEPTION.create();
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
displayTimings( context.getSource(), timings.getSnapshot(), new AggregatedMetric( Metrics.COMPUTER_TASKS, Aggregate.AVG ), DEFAULT_FIELDS );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
return 1;
} ) )
.then( command( "dump" )
.requires( UserLevel.OWNER_OP )
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
.argManyValue( "fields", metric(), DEFAULT_FIELDS )
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
.executes( ( context, fields ) -> {
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
AggregatedMetric sort;
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
if( fields.size() == 1 && DEFAULT_FIELDS.contains( fields.get( 0 ) ) )
{
sort = fields.get( 0 );
fields = DEFAULT_FIELDS;
}
else
{
sort = fields.get( 0 );
}
return displayTimings( context.getSource(), sort, fields );
} ) ) )
);
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
}
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
private static Component linkComputer( CommandSourceStack source, ServerComputer serverComputer, int computerId )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
MutableComponent out = new TextComponent( "" );
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
// Append the computer instance
if( serverComputer == null )
{
Update mappings
2020-07-27 17:26:42 +00:00
out.append( text( "?" ) );
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
}
else
{
Update mappings
2020-07-27 17:26:42 +00:00
out.append( link(
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
text( Integer.toString( serverComputer.getInstanceID() ) ),
"/computercraft dump " + serverComputer.getInstanceID(),
Remove most instances of non-translatable strings Oh goodness, this is going to painful to update to 1.13. We now translate: - Computer/Disk ID tooltips - /computercraft descriptions, synopsises and usages. The last of these may not always be translated when in SMP, as it is sometimes done on the server, but the alternative would be more complex than I'm happy with. - Tracking field names. Might be worth adding descriptions too in the future. Also cleanup a couple of other translation keys, so they're more consistent with Minecraft. Closes #141
2019-03-16 10:26:40 +00:00
translate( "commands.computercraft.dump.action" )
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
) );
}
// And ID
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
out.append( " (id " + computerId + ")" );
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
// And, if we're a player, some useful links
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
if( serverComputer != null && UserLevel.OP.test( source ) && isPlayer( source ) )
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
{
out
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
.append( " " )
Update mappings
2020-07-27 17:26:42 +00:00
.append( link(
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
text( "\u261b" ),
"/computercraft tp " + serverComputer.getInstanceID(),
Remove most instances of non-translatable strings Oh goodness, this is going to painful to update to 1.13. We now translate: - Computer/Disk ID tooltips - /computercraft descriptions, synopsises and usages. The last of these may not always be translated when in SMP, as it is sometimes done on the server, but the alternative would be more complex than I'm happy with. - Tracking field names. Might be worth adding descriptions too in the future. Also cleanup a couple of other translation keys, so they're more consistent with Minecraft. Closes #141
2019-03-16 10:26:40 +00:00
translate( "commands.computercraft.tp.action" )
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
) )
Switch to Mojang mappings ForgeGradle (probably sensibly) yells at me about doing this. However: - There's a reasonable number of mods doing this, which establishes some optimistic precedent. - The licence update in Aug 2020 now allows you to use them for "development purposes". I guess source code counts?? - I'm fairly sure this is also compatible with the CCPL - there's an exception for Minecraft code. The main motivation for this is to make the Fabric port a little easier. Hopefully folks (maybe me in the future, we'll see) will no longer have to deal with mapping hell when merging - only mod loader hell.
2021-01-09 19:22:58 +00:00
.append( " " )
Update mappings
2020-07-27 17:26:42 +00:00
.append( link(
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
text( "\u20e2" ),
"/computercraft view " + serverComputer.getInstanceID(),
Remove most instances of non-translatable strings Oh goodness, this is going to painful to update to 1.13. We now translate: - Computer/Disk ID tooltips - /computercraft descriptions, synopsises and usages. The last of these may not always be translated when in SMP, as it is sometimes done on the server, but the alternative would be more complex than I'm happy with. - Tracking field names. Might be worth adding descriptions too in the future. Also cleanup a couple of other translation keys, so they're more consistent with Minecraft. Closes #141
2019-03-16 10:26:40 +00:00
translate( "commands.computercraft.view.action" )
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
) );
}
Add button to view computer's folder Implementation is a little awkward, as we can't send OPEN_FILE links from the server, so we ensure the client runs a /computercraft open-computer ID command instead. We then intercept this on the client side and use that to open the folder.
2021-05-28 21:19:04 +00:00
if( UserLevel.OWNER.test( source ) && isPlayer( source ) )
{
Merge branch 'mc-1.16.x' into mc-1.18.x I dare say there's going to be some bugs with this. I was as careful as I could be, but yikes it was nasty.
2022-10-25 21:36:21 +00:00
Component linkPath = linkStorage( source, computerId );
Add button to view computer's folder Implementation is a little awkward, as we can't send OPEN_FILE links from the server, so we ensure the client runs a /computercraft open-computer ID command instead. We then intercept this on the client side and use that to open the folder.
2021-05-28 21:19:04 +00:00
if( linkPath != null ) out.append( " " ).append( linkPath );
}
Improve using /computercraft as a non-player - Fix text table only showing the first row (fixes #40) - Do not emit alignment characters in monospace environments - Reduce padding in monospace environments Also make the output of dump consistent with that of the profiler: we provide tp and view shortcuts for each computer.
2018-06-22 07:28:36 +00:00
return out;
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
}
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
private static Component linkPosition( CommandSourceStack context, ServerComputer computer )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
if( UserLevel.OP.test( context ) )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
{
return link(
position( computer.getPosition() ),
"/computercraft tp " + computer.getInstanceID(),
Remove most instances of non-translatable strings Oh goodness, this is going to painful to update to 1.13. We now translate: - Computer/Disk ID tooltips - /computercraft descriptions, synopsises and usages. The last of these may not always be translated when in SMP, as it is sometimes done on the server, but the alternative would be more complex than I'm happy with. - Tracking field names. Might be worth adding descriptions too in the future. Also cleanup a couple of other translation keys, so they're more consistent with Minecraft. Closes #141
2019-03-16 10:26:40 +00:00
translate( "commands.computercraft.tp.action" )
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
);
}
else
{
return position( computer.getPosition() );
}
}
Add computer performance monitor
2018-02-02 13:34:27 +00:00
Merge branch 'mc-1.16.x' into mc-1.18.x I dare say there's going to be some bugs with this. I was as careful as I could be, but yikes it was nasty.
2022-10-25 21:36:21 +00:00
private static Component linkStorage( CommandSourceStack source, int id )
Add button to view computer's folder Implementation is a little awkward, as we can't send OPEN_FILE links from the server, so we ensure the client runs a /computercraft open-computer ID command instead. We then intercept this on the client side and use that to open the folder.
2021-05-28 21:19:04 +00:00
{
Start work on curtailing our global state The last 4 or 5 commits have simplified things. I can now have some unnecessary complexity as a treat! This is some initial work on better tying the lifecycle of computers (and ComputerCraft) related state to the lifecycle of the current Minecraft server. - Move server-wide methods in IComputerEnvironment (such as creating resource mounts) into a separate interface. - Add a new ServerContext class, which now holds the ID Assigner, server computer registry, and some other tiny bits and bobs. This can only be accessed by ServerContect.get(MinecraftServer), forcing slightly better discipline for how we use these globals. This does allow us to nuke some of the ugliest bits in IDAssigner. Even if it makes things much longer!
2022-10-21 20:01:01 +00:00
File file = new File( ServerContext.get( source.getServer() ).storageDir().toFile(), "computer/" + id );
Add button to view computer's folder Implementation is a little awkward, as we can't send OPEN_FILE links from the server, so we ensure the client runs a /computercraft open-computer ID command instead. We then intercept this on the client side and use that to open the folder.
2021-05-28 21:19:04 +00:00
if( !file.isDirectory() ) return null;
return link(
text( "\u270E" ),
ClientCommands.OPEN_COMPUTER + id,
translate( "commands.computercraft.dump.open_path" )
);
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
@Nonnull
Merge branch 'mc-1.16.x' into mc-1.18.x I dare say there's going to be some bugs with this. I was as careful as I could be, but yikes it was nasty.
2022-10-25 21:36:21 +00:00
private static BasicComputerMetricsObserver getMetricsInstance( CommandSourceStack source )
Add computer performance monitor
2018-02-02 13:34:27 +00:00
{
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
Entity entity = source.getEntity();
Merge branch 'mc-1.16.x' into mc-1.18.x I dare say there's going to be some bugs with this. I was as careful as I could be, but yikes it was nasty.
2022-10-25 21:36:21 +00:00
return ServerContext.get( source.getServer() ).metrics().getMetricsInstance( entity instanceof Player ? entity.getUUID() : SYSTEM_UUID );
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
}
Add computer performance monitor
2018-02-02 13:34:27 +00:00
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
private static final List<AggregatedMetric> DEFAULT_FIELDS = Arrays.asList(
new AggregatedMetric( Metrics.COMPUTER_TASKS, Aggregate.COUNT ),
new AggregatedMetric( Metrics.COMPUTER_TASKS, Aggregate.NONE ),
Bump CC:T to 1.101.0 These version numbers are very hard to type correctly.
2022-11-01 20:01:21 +00:00
new AggregatedMetric( Metrics.COMPUTER_TASKS, Aggregate.AVG )
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
);
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
Merge branch 'mc-1.16.x' into mc-1.18.x I dare say there's going to be some bugs with this. I was as careful as I could be, but yikes it was nasty.
2022-10-25 21:36:21 +00:00
private static int displayTimings( CommandSourceStack source, AggregatedMetric sortField, List<AggregatedMetric> fields ) throws CommandSyntaxException
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
{
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
return displayTimings( source, getMetricsInstance( source ).getTimings(), sortField, fields );
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
}
Merge branch 'mc-1.16.x' into mc-1.18.x I dare say there's going to be some bugs with this. I was as careful as I could be, but yikes it was nasty.
2022-10-25 21:36:21 +00:00
private static int displayTimings( CommandSourceStack source, List<ComputerMetrics> timings, AggregatedMetric sortField, List<AggregatedMetric> fields ) throws CommandSyntaxException
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
{
if( timings.isEmpty() ) throw NO_TIMINGS_EXCEPTION.create();
Add computer performance monitor
2018-02-02 13:34:27 +00:00
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
timings.sort( Comparator.<ComputerMetrics, Long>comparing( x -> x.get( sortField.metric(), sortField.aggregate() ) ).reversed() );
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
Component[] headers = new Component[1 + fields.size()];
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
headers[0] = translate( "commands.computercraft.track.dump.computer" );
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
for( int i = 0; i < fields.size(); i++ ) headers[i + 1] = fields.get( i ).displayName();
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
TableBuilder table = new TableBuilder( TRACK_ID, headers );
Various improvements to the tracking system - Trackers are created per-user, meaning multiple people can run /computercraft track at once. - Allow sorting the tracking information by arbitrary fields. - Add support for tracking arbitrary fields (though none are currently implemented).
2018-04-16 20:06:16 +00:00
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
for( ComputerMetrics entry : timings )
Add computer performance monitor
2018-02-02 13:34:27 +00:00
{
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
ServerComputer serverComputer = entry.computer();
Add computer performance monitor
2018-02-02 13:34:27 +00:00
Merge branch 'mc-1.16.x' into mc-1.18.x I dare say there's going to be some bugs with this. I was as careful as I could be, but yikes it was nasty.
2022-10-25 21:36:21 +00:00
Component computerComponent = linkComputer( source, serverComputer, entry.computerId() );
Error when missing computers after executing the command This allows you to automate running various commands and still have them "work" if some computers are not loaded. Closes #47
2018-08-04 09:39:44 +00:00
Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.
2021-08-03 20:46:53 +00:00
Component[] row = new Component[1 + fields.size()];
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
row[0] = computerComponent;
Rewrite the metrics system - Remove TrackingField and replace it with a Metric abstract class. This has two concrete subclasses - Counter and Event. Events carry an additional piece of data each time it is observed, such as HTTP response size. - Computers now accept a MetricsObserver, which tracks metrics for this particular computer. This allows us to decouple Computer classes and metrics information. The concrete MetricsObserver class we use within Minecraft exposes the ServerComputer directly, so we no longer need to do the awkward mapping and lookups! - The /computercraft command can now do aggregates (count, avg, max) over all Event metrics. This removes the need for special handling of computer and server time. There's also a small number of changes in removing the coupling between Computer and some of its dependencies (ILuaMachine, MainThreadExecutor). This makes some future refactorings easier, I promise!
2022-10-22 00:35:04 +00:00
for( int i = 0; i < fields.size(); i++ )
{
AggregatedMetric metric = fields.get( i );
row[i + 1] = text( entry.getFormatted( metric.metric(), metric.aggregate() ) );
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
table.row( row );
Error when missing computers after executing the command This allows you to automate running various commands and still have them "work" if some computers are not loaded. Closes #47
2018-08-04 09:39:44 +00:00
}
Update CC: Tweaked to 1.13 Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
2019-04-02 12:27:27 +00:00
table.display( source );
return timings.size();
Error when missing computers after executing the command This allows you to automate running various commands and still have them "work" if some computers are not loaded. Closes #47
2018-08-04 09:39:44 +00:00
}
Copy over CCTweaks's command system This adds several commands which may be useful for server owners. It'd be nice to integrate this into ComputerCraft itself, but the associated command framework is quite large so we'd have to think about it.
2017-12-06 15:51:02 +00:00
}