mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-10 17:30:29 +00:00
Code Issues Releases Wiki Activity
9bf586b018
CC-Tweaked/src/main/java/dan200/computercraft/ComputerCraft.java

656 lines
22 KiB
Java
Raw Normal View History

Use block comment instead of Javadoc for license
2017-05-07 00:18:59 +00:00
/*
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
* This file is part of ComputerCraft - http://www.computercraft.info
Happy new year!
2019-01-01 01:10:18 +00:00
* Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
* Send enquiries to dratcliffe@gmail.com
*/
Add config GUI This allows you to modify various settings in-game.
2017-05-01 21:13:25 +00:00
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
package dan200.computercraft;
import dan200.computercraft.api.filesystem.IMount;
import dan200.computercraft.api.filesystem.IWritableMount;
Provide an API for registering custom APIs ILuaAPI has been moved to dan200.computercraft.api.lua. One creates a new API by registering an instance of ILuaAPIFactory. This takes an instance of IComputerSystem and returns such an API. IComputerSystem is an extension of IComputerAccess, with methods to access additional information about the the computer, such as its label and filesystem.
2017-11-18 13:40:38 +00:00
import dan200.computercraft.api.lua.ILuaAPIFactory;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.api.media.IMedia;
import dan200.computercraft.api.media.IMediaProvider;
Switch from using INetwork to IPacketNetwork
2017-05-06 20:19:55 +00:00
import dan200.computercraft.api.network.IPacketNetwork;
Add the default implementation of wired networks
2018-02-21 15:29:34 +00:00
import dan200.computercraft.api.network.wired.IWiredElement;
import dan200.computercraft.api.network.wired.IWiredNode;
Add a method stub for OpenComputers Fixes #94
2019-01-02 17:37:16 +00:00
import dan200.computercraft.api.peripheral.IPeripheral;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.api.peripheral.IPeripheralProvider;
import dan200.computercraft.api.permissions.ITurtlePermissionProvider;
Add registry for pocket computer upgrades
2017-05-02 00:46:17 +00:00
import dan200.computercraft.api.pocket.IPocketUpgrade;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
import dan200.computercraft.api.turtle.ITurtleUpgrade;
Add config options to disable various turtle actions Mostly intended for those people who don't like .inspect() or .getItemDetail(), but could allow modpacks to block equipping upgrades, placing blocks, etc...
2018-02-16 10:37:47 +00:00
import dan200.computercraft.api.turtle.event.TurtleAction;
Restructure the HTTP API - Adds support for blacklisting domains - Adds support for blacklisting & whitelisting IP addresses and IP ranges. - Reuse threads for HTTP requests AddressPredicate will parse a series of patterns and convert them into regexes or CIDR ranges. When checking whether an address is accessible, we first ensure the domain is whitelisted and isn't blacklisted. If everything is OK, then we start create a new thread for the HTTP request and resolve the IP, ensuring that is whitelisted & not blacklisted. Then the normal HTTP request is continued. However, http.checkURL also needs to resolve the IP address. In order to avoid blocking the Lua thread, this method will return instantly and create a new thread which will queue an event. As both http.request and http.checkURL are now creating threads and queuing events, some logic is abstracted into a separate HTTPTask class - this allows us to share the thread creation, finishing and cancelling logic.
2017-06-11 20:40:08 +00:00
import dan200.computercraft.core.apis.AddressPredicate;
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
import dan200.computercraft.core.apis.ApiFactories;
WIP: Http rework (#98) - Move all HTTP tasks to a unified "MonitoredResource" model. This provides a uniform way of tracking object's lifetimes and disposing of them when complete. - Rewrite HTTP requests to use Netty instead of standard Java. This offers several advantages: - We have access to more HTTP verbs (mostly PATCH). - We can now do http -> https redirects. - We no longer need to spawn in a new thread for each HTTP request. While we do need to run some tasks off-thread in order to resolve IPs, it's generally a much shorter task, and so is less likely to inflate the thread pool. - Introduce several limits for the http API: - There's a limit on how many HTTP requests and websockets may exist at the same time. If the limit is reached, additional ones will be queued up until pending requests have finished. - HTTP requests may upload a maximum of 4Mib and download a maximum of 16Mib (configurable). - .getResponseCode now returns the status text, as well as the status code.
2019-01-11 11:33:05 +00:00
import dan200.computercraft.core.apis.http.websocket.Websocket;
An initial prototype of main thread rate limiting Unlike ComputerThread, we do not have a single source of tasks, and so need a smarter way to handle scheduling and rate limiting. This introduces a cooldown system, which works on both a global and per-computer level: Each computer is allowed to do some work for 5ms. If they go over that budget, then they are marked as "hot", and will not execute work on the next tick, until they have cooled down. This ensures that _on average_ computers perform at most 5ms of work per tick. Obviously this is a rather large time span, so we also apply a global 10ms to all computers. This uses the same cooldown principle, meaning we keep to an average of 10ms, even if we go over budget.
2019-03-19 12:24:36 +00:00
import dan200.computercraft.core.computer.MainThread;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.core.filesystem.ComboMount;
import dan200.computercraft.core.filesystem.FileMount;
Remove FileSystemMount and rewrite JarMount FileSystemMount was originally added to allow using ReadableByteChannels instead of InputStreams. However, as zip files do not allow seeking, there is no benefit of using them over the original JarMount (which we need to preserve for backwards compatibility). Instead of maintaining two near-identical mounts, we remove the FileSystemMount and rewrite the JarMount implementation with several improvements: - Rewrite the jar scanning algorithm to be closer to 1.13+'s data pack mount. This means we no longer require the jar file to have directories before the file (though this was not a problem in practice). - Add all JarMounts to a ReferenceQueue, closing up the ZipFile when they have been garbage collected (fixes #100). - Cache the contents of all files for 60 seconds (with some constraints on size). This allows us to seek on ROM files too (assuming they are small), by reading the whole thing into memory. The cache is shared across all mounts, and has a 64MiB limit, and thus should not have an adverse impact on memory.
2019-01-16 17:25:46 +00:00
import dan200.computercraft.core.filesystem.JarMount;
Add support for tracking fs, turtle and peripheral operations See #25
2018-04-17 08:22:26 +00:00
import dan200.computercraft.core.tracking.Tracking;
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
import dan200.computercraft.shared.*;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.shared.computer.blocks.BlockCommandComputer;
import dan200.computercraft.shared.computer.blocks.BlockComputer;
import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
Store references to the registered items This means we can avoid several rather ugly instances of getItemBlock and a cast. We also derive the ItemBlock's registered name from the block's name, which makes the register a little less ugly.
2019-01-12 19:01:32 +00:00
import dan200.computercraft.shared.computer.items.ItemCommandComputer;
import dan200.computercraft.shared.computer.items.ItemComputer;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.shared.media.items.ItemDiskExpanded;
import dan200.computercraft.shared.media.items.ItemDiskLegacy;
import dan200.computercraft.shared.media.items.ItemPrintout;
import dan200.computercraft.shared.media.items.ItemTreasureDisk;
import dan200.computercraft.shared.peripheral.common.BlockPeripheral;
Store references to the registered items This means we can avoid several rather ugly instances of getItemBlock and a cast. We also derive the ItemBlock's registered name from the block's name, which makes the register a little less ugly.
2019-01-12 19:01:32 +00:00
import dan200.computercraft.shared.peripheral.common.ItemPeripheral;
Move several methods from TileGeneric to blocks - getPickBlock is now implemented directly on computers and turtles, rather than on the tile. - Bounding boxes are handled on the block rather than tile. This ends up being a little ugly in the case of BlockPeripheral, but it's not the end of the world. - Explosion resistance is only implemented for turtles now.
2018-12-27 11:32:29 +00:00
import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
import dan200.computercraft.shared.peripheral.modem.wired.BlockWiredModemFull;
Store references to the registered items This means we can avoid several rather ugly instances of getItemBlock and a cast. We also derive the ItemBlock's registered name from the block's name, which makes the register a little less ugly.
2019-01-12 19:01:32 +00:00
import dan200.computercraft.shared.peripheral.modem.wired.ItemCable;
Move modem code into separate packages Things were shared between common and modem, which just ended up making things very complicated.
2018-12-27 10:10:44 +00:00
import dan200.computercraft.shared.peripheral.modem.wireless.BlockAdvancedModem;
Store references to the registered items This means we can avoid several rather ugly instances of getItemBlock and a cast. We also derive the ItemBlock's registered name from the block's name, which makes the register a little less ugly.
2019-01-12 19:01:32 +00:00
import dan200.computercraft.shared.peripheral.modem.wireless.ItemAdvancedModem;
Move modem code into separate packages Things were shared between common and modem, which just ended up making things very complicated.
2018-12-27 10:10:44 +00:00
import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
Add registry for pocket computer upgrades
2017-05-02 00:46:17 +00:00
import dan200.computercraft.shared.pocket.peripherals.PocketModem;
Added PocketSpeaker & corrected blockmodel for turtle speaker
2017-05-12 18:57:48 +00:00
import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.shared.proxy.IComputerCraftProxy;
import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
Store references to the registered items This means we can avoid several rather ugly instances of getItemBlock and a cast. We also derive the ItemBlock's registered name from the block's name, which makes the register a little less ugly.
2019-01-12 19:01:32 +00:00
import dan200.computercraft.shared.turtle.items.ItemTurtleAdvanced;
import dan200.computercraft.shared.turtle.items.ItemTurtleLegacy;
import dan200.computercraft.shared.turtle.items.ItemTurtleNormal;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import dan200.computercraft.shared.turtle.upgrades.*;
Fix tile entities being registered with incorrect names We'd somehow added spaces, which means they weren't registered under the computercraft domain (rather, the "computercraft " one). We also create a datafixer to ensure old worlds are handled correctly.
2018-11-16 12:29:29 +00:00
import dan200.computercraft.shared.util.CreativeTabMain;
import dan200.computercraft.shared.util.IDAssigner;
WIP: Http rework (#98) - Move all HTTP tasks to a unified "MonitoredResource" model. This provides a uniform way of tracking object's lifetimes and disposing of them when complete. - Rewrite HTTP requests to use Netty instead of standard Java. This offers several advantages: - We have access to more HTTP verbs (mostly PATCH). - We can now do http -> https redirects. - We no longer need to spawn in a new thread for each HTTP request. While we do need to run some tasks off-thread in order to resolve IPs, it's generally a much shorter task, and so is less likely to inflate the thread pool. - Introduce several limits for the http API: - There's a limit on how many HTTP requests and websockets may exist at the same time. If the limit is reached, additional ones will be queued up until pending requests have finished. - HTTP requests may upload a maximum of 4Mib and download a maximum of 16Mib (configurable). - .getResponseCode now returns the status text, as well as the status code.
2019-01-11 11:33:05 +00:00
import dan200.computercraft.shared.util.IoUtil;
Convert wired elements to capabilities See #18
2018-03-24 11:57:36 +00:00
import dan200.computercraft.shared.wired.CapabilityWiredElement;
Add the default implementation of wired networks
2018-02-21 15:29:34 +00:00
import dan200.computercraft.shared.wired.WiredNode;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import net.minecraft.entity.player.EntityPlayer;
Store references to the registered items This means we can avoid several rather ugly instances of getItemBlock and a cast. We also derive the ItemBlock's registered name from the block's name, which makes the register a little less ugly.
2019-01-12 19:01:32 +00:00
import net.minecraft.item.ItemBlock;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
Convert wired elements to capabilities See #18
2018-03-24 11:57:36 +00:00
import net.minecraft.tileentity.TileEntity;
Fire all entity interaction events in TurtlePlaceCommand This allows turtles to interact with entities correctly.
2017-05-01 14:39:03 +00:00
import net.minecraft.util.EnumFacing;
ComputerCraft 1.80pr0 Updated the source code to the version shipped as the 1.80pr0 alpha release. Also removed some unnecessary files from the LuaJ subfolder which were bulking up the repository.
2017-05-01 13:51:26 +00:00
import net.minecraft.util.math.BlockPos;
Add the default implementation of wired networks
2018-02-21 15:29:34 +00:00
import net.minecraft.world.IBlockAccess;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import net.minecraft.world.World;
Even more proxy pruning - Move the "world directory" getter out of the proxy - we can just use Forge's code here. - Remove the server proxies, as both were empty. We don't tend to register any dedicated-server specific code, so I think we can leave them out.
2019-01-12 18:20:16 +00:00
import net.minecraftforge.common.DimensionManager;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.*;
import net.minecraftforge.fml.relauncher.Side;
Remove ILogger facade Just use global Log4j logger on the ComputerCraft class.
2017-05-13 21:26:35 +00:00
import org.apache.logging.log4j.Logger;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Adds the ability to load custom bios.lua files from resource packs Computer now delegates to IComputerEnvironment which, by default, looks in the following locations: - Resouce pack files - The "debug" folder - The original ComputerCraft jar
2017-07-14 20:50:51 +00:00
import java.io.*;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
Expose max computer/global times as config options These do have a direct impact on server performance, so are definitely worthwhile exposing.
2019-03-21 13:31:58 +00:00
import java.util.concurrent.TimeUnit;
Adds the ability to load custom bios.lua files from resource packs Computer now delegates to IComputerEnvironment which, by default, looks in the following locations: - Resouce pack files - The "debug" folder - The original ComputerCraft jar
2017-07-14 20:50:51 +00:00
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Add config GUI This allows you to modify various settings in-game.
2017-05-01 21:13:25 +00:00
@Mod(
Rebranding! I feel kinda guilty about this, but it's probably a good idea to make it clear that this isn't "actual, proper, stable" ComputerCraft.
2017-11-15 16:25:10 +00:00
modid = ComputerCraft.MOD_ID, name = "CC: Tweaked", version = "${version}",
Bump version and require a minimum version of Forge
2018-11-21 18:11:14 +00:00
guiFactory = "dan200.computercraft.client.gui.GuiConfigCC$Factory",
dependencies = "required:forge@[14.23.4.2746,)"
Add config GUI This allows you to modify various settings in-game.
2017-05-01 21:13:25 +00:00
)
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public class ComputerCraft
{
Update to 1.11.2
2017-05-11 00:08:26 +00:00
public static final String MOD_ID = "computercraft";
Fix all the deprecated warnings
2017-05-07 00:42:32 +00:00
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
// Configuration options
Clean up our handling of configuration files - Move configuration loading into a separate file, just so it doesn't clutter up ComputerCraft.java. - Normalise property names, so they're all snake_case. - Split properties into separate categories (http, turtle, peripheral), so the main one is less cluttered. - Define an explicit ordering of each category.
2019-01-05 20:12:02 +00:00
public static final String[] DEFAULT_HTTP_WHITELIST = new String[] { "*" };
public static final String[] DEFAULT_HTTP_BLACKLIST = new String[] {
Migrate default whitelist/blacklist values to fields This means we're not duplicating them between the initial field and property creation.
2017-06-28 21:33:20 +00:00
"127.0.0.0/8",
"10.0.0.0/8",
"172.16.0.0/12",
"192.168.0.0/16",
"fd00::/8",
};
Add support for enabling Lua's debug library Whilst I'm pretty sure this is safe for general use, I'm disabling this by default for now. I may consider enabling it in the future if no issues are found.
2017-11-15 11:57:52 +00:00
Clean up our handling of configuration files - Move configuration loading into a separate file, just so it doesn't clutter up ComputerCraft.java. - Normalise property names, so they're all snake_case. - Split properties into separate categories (http, turtle, peripheral), so the main one is less cluttered. - Define an explicit ordering of each category.
2019-01-05 20:12:02 +00:00
public static int computerSpaceLimit = 1000 * 1000;
public static int floppySpaceLimit = 125 * 1000;
public static int maximumFilesOpen = 128;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static boolean disable_lua51_features = false;
public static String default_computer_settings = "";
Clean up our handling of configuration files - Move configuration loading into a separate file, just so it doesn't clutter up ComputerCraft.java. - Normalise property names, so they're all snake_case. - Split properties into separate categories (http, turtle, peripheral), so the main one is less cluttered. - Define an explicit ordering of each category.
2019-01-05 20:12:02 +00:00
public static boolean debug_enable = true;
Disable peripheral logging by default
2017-05-16 18:35:07 +00:00
public static boolean logPeripheralErrors = false;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Expose max computer/global times as config options These do have a direct impact on server performance, so are definitely worthwhile exposing.
2019-03-21 13:31:58 +00:00
public static int computer_threads = 1;
public static long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos( 10 );
public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos( 5 );
Clean up our handling of configuration files - Move configuration loading into a separate file, just so it doesn't clutter up ComputerCraft.java. - Normalise property names, so they're all snake_case. - Split properties into separate categories (http, turtle, peripheral), so the main one is less cluttered. - Define an explicit ordering of each category.
2019-01-05 20:12:02 +00:00
public static boolean http_enable = true;
public static boolean http_websocket_enable = true;
public static AddressPredicate http_whitelist = new AddressPredicate( DEFAULT_HTTP_WHITELIST );
public static AddressPredicate http_blacklist = new AddressPredicate( DEFAULT_HTTP_BLACKLIST );
Add a config option for HTTP timeout too
2019-01-11 21:11:22 +00:00
public static int httpTimeout = 30000;
WIP: Http rework (#98) - Move all HTTP tasks to a unified "MonitoredResource" model. This provides a uniform way of tracking object's lifetimes and disposing of them when complete. - Rewrite HTTP requests to use Netty instead of standard Java. This offers several advantages: - We have access to more HTTP verbs (mostly PATCH). - We can now do http -> https redirects. - We no longer need to spawn in a new thread for each HTTP request. While we do need to run some tasks off-thread in order to resolve IPs, it's generally a much shorter task, and so is less likely to inflate the thread pool. - Introduce several limits for the http API: - There's a limit on how many HTTP requests and websockets may exist at the same time. If the limit is reached, additional ones will be queued up until pending requests have finished. - HTTP requests may upload a maximum of 4Mib and download a maximum of 16Mib (configurable). - .getResponseCode now returns the status text, as well as the status code.
2019-01-11 11:33:05 +00:00
public static int httpMaxRequests = 16;
public static long httpMaxDownload = 16 * 1024 * 1024;
public static long httpMaxUpload = 4 * 1024 * 1024;
public static int httpMaxWebsockets = 4;
public static int httpMaxWebsocketMessage = Websocket.MAX_MESSAGE_SIZE;
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
public static boolean enableCommandBlock = false;
Clean up our handling of configuration files - Move configuration loading into a separate file, just so it doesn't clutter up ComputerCraft.java. - Normalise property names, so they're all snake_case. - Split properties into separate categories (http, turtle, peripheral), so the main one is less cluttered. - Define an explicit ordering of each category.
2019-01-05 20:12:02 +00:00
public static int modem_range = 64;
public static int modem_highAltitudeRange = 384;
public static int modem_rangeDuringStorm = 64;
public static int modem_highAltitudeRangeDuringStorm = 384;
public static int maxNotesPerTick = 8;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static boolean turtlesNeedFuel = true;
public static int turtleFuelLimit = 20000;
public static int advancedTurtleFuelLimit = 100000;
public static boolean turtlesObeyBlockProtection = true;
public static boolean turtlesCanPush = true;
Add config options to disable various turtle actions Mostly intended for those people who don't like .inspect() or .getItemDetail(), but could allow modpacks to block equipping upgrades, placing blocks, etc...
2018-02-16 10:37:47 +00:00
public static EnumSet<TurtleAction> turtleDisabledActions = EnumSet.noneOf( TurtleAction.class );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static final int terminalWidth_computer = 51;
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
public static final int terminalHeight_computer = 19;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static final int terminalWidth_turtle = 39;
public static final int terminalHeight_turtle = 13;
public static final int terminalWidth_pocketComputer = 26;
public static final int terminalHeight_pocketComputer = 20;
// Blocks and Items
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
public static final class Blocks
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
{
public static BlockComputer computer;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
public static BlockCommandComputer commandComputer;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static BlockTurtle turtle;
public static BlockTurtle turtleExpanded;
public static BlockTurtle turtleAdvanced;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
public static BlockPeripheral peripheral;
public static BlockCable cable;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static BlockAdvancedModem advancedModem;
Add full block wired modems These act similarly to conventional wired modems, but with the advantage that they are a full block. This means they can be attached to peripherals which are not solid (such as chests). Further more, as they do not have a direction, they allow wrapping peripherals on all 6 sides. It's worth noting that wired modems do not require a cable - they will automatically form connections to adjacent network elements when placed.
2018-02-21 15:40:08 +00:00
public static BlockWiredModemFull wiredModemFull;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
public static final class Items
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
{
Store references to the registered items This means we can avoid several rather ugly instances of getItemBlock and a cast. We also derive the ItemBlock's registered name from the block's name, which makes the register a little less ugly.
2019-01-12 19:01:32 +00:00
public static ItemComputer computer;
public static ItemCommandComputer commandComputer;
public static ItemTurtleLegacy turtle;
public static ItemTurtleNormal turtleExpanded;
public static ItemTurtleAdvanced turtleAdvanced;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
public static ItemPocketComputer pocketComputer;
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
public static ItemDiskLegacy disk;
public static ItemDiskExpanded diskExpanded;
public static ItemTreasureDisk treasureDisk;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
public static ItemPrintout printout;
Store references to the registered items This means we can avoid several rather ugly instances of getItemBlock and a cast. We also derive the ItemBlock's registered name from the block's name, which makes the register a little less ugly.
2019-01-12 19:01:32 +00:00
public static ItemPeripheral peripheral;
public static ItemAdvancedModem advancedModem;
public static ItemCable cable;
public static ItemBlock wiredModemFull;
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
}
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
public static final class TurtleUpgrades
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
{
public static TurtleModem wirelessModem;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
public static TurtleModem advancedModem;
public static TurtleSpeaker speaker;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static TurtleCraftingTable craftingTable;
public static TurtleSword diamondSword;
public static TurtleShovel diamondShovel;
public static TurtleTool diamondPickaxe;
public static TurtleAxe diamondAxe;
public static TurtleHoe diamondHoe;
}
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
public static final class PocketUpgrades
Add registry for pocket computer upgrades
2017-05-02 00:46:17 +00:00
{
public static PocketModem wirelessModem;
public static PocketModem advancedModem;
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
public static PocketSpeaker speaker;
Backwards compat patch for Plethora Ughghgghghr.
2019-01-20 16:16:02 +00:00
@Deprecated
public static PocketSpeaker pocketSpeaker;
}
@Deprecated
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
public static final class Upgrades
Some further improvements to BlockGeneric - Only have computers implement custom block drop logic: everything else only drops in creative mode. - Fix redstone inputs not being received correctly. Introduced in 8b86a954ee4728d299cdfea7511867040e4e91ef, yes I'm a silly billy. - Only update the neighbour which changed.
2019-01-25 22:03:44 +00:00
{
Backwards compat patch for Plethora Ughghgghghr.
2019-01-20 16:16:02 +00:00
public static TurtleModem advancedModem;
Add registry for pocket computer upgrades
2017-05-02 00:46:17 +00:00
}
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
// Registries
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
// Creative
public static CreativeTabMain mainCreativeTab;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Remove ILogger facade Just use global Log4j logger on the ComputerCraft class.
2017-05-13 21:26:35 +00:00
// Logging
public static Logger log;
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
// Peripheral providers. This is still here to ensure compatibility with Plethora and Computronics
public static List<IPeripheralProvider> peripheralProviders = new ArrayList<>();
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
// Implementation
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
@Mod.Instance( ComputerCraft.MOD_ID )
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
public static ComputerCraft instance;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Even more proxy pruning - Move the "world directory" getter out of the proxy - we can just use Forge's code here. - Remove the server proxies, as both were empty. We don't tend to register any dedicated-server specific code, so I think we can leave them out.
2019-01-12 18:20:16 +00:00
@SidedProxy(
clientSide = "dan200.computercraft.client.proxy.ComputerCraftProxyClient",
serverSide = "dan200.computercraft.shared.proxy.ComputerCraftProxyCommon"
)
private static IComputerCraftProxy proxy;
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
@Mod.EventHandler
public void preInit( FMLPreInitializationEvent event )
{
Remove ILogger facade Just use global Log4j logger on the ComputerCraft class.
2017-05-13 21:26:35 +00:00
log = event.getModLog();
Add a basic logging system This adds a common ILogger interface and two built-in loggers - one which prints to stdout, the other using a Log4J logger. These are split up as not to cause dependency issues for emulators. The stdout logger is enabled by default, but the ComputerCraft mod class will swap over to using FML's mod specific logger, which provides a more consistent look with the rest of Minecraft.
2017-05-08 18:28:50 +00:00
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
// Load config
Clean up our handling of configuration files - Move configuration loading into a separate file, just so it doesn't clutter up ComputerCraft.java. - Normalise property names, so they're all snake_case. - Split properties into separate categories (http, turtle, peripheral), so the main one is less cluttered. - Define an explicit ordering of each category.
2019-01-05 20:12:02 +00:00
Config.load( event.getSuggestedConfigurationFile() );
Add command to reload config from disk Also bump version number, as we're relatively close to a release and it's frustrating having to bump it when putting out previews.
2018-02-16 09:33:40 +00:00
proxy.preInit();
}
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
@Mod.EventHandler
public void init( FMLInitializationEvent event )
{
proxy.init();
}
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
@Mod.EventHandler
public void onServerStarting( FMLServerStartingEvent event )
{
A couple of fixes for maven and CCEmuX - Add additional maven metadata and strip dependencies - Shift ICommand registration into the proxy, to avoid class loading issues. This is probably rather temperamental, but classloading always is.
2018-04-20 18:39:53 +00:00
proxy.initServer( event.getServer() );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
@Mod.EventHandler
public void onServerStart( FMLServerStartedEvent event )
{
if( FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER )
{
ComputerCraft.serverComputerRegistry.reset();
WirelessNetwork.resetNetworks();
An initial prototype of main thread rate limiting Unlike ComputerThread, we do not have a single source of tasks, and so need a smarter way to handle scheduling and rate limiting. This introduces a cooldown system, which works on both a global and per-computer level: Each computer is allowed to do some work for 5ms. If they go over that budget, then they are marked as "hot", and will not execute work on the next tick, until they have cooled down. This ensures that _on average_ computers perform at most 5ms of work per tick. Obviously this is a rather large time span, so we also apply a global 10ms to all computers. This uses the same cooldown principle, meaning we keep to an average of 10ms, even if we go over budget.
2019-03-19 12:24:36 +00:00
MainThread.reset();
Add support for tracking fs, turtle and peripheral operations See #25
2018-04-17 08:22:26 +00:00
Tracking.reset();
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
}
@Mod.EventHandler
public void onServerStopped( FMLServerStoppedEvent event )
{
if( FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER )
{
ComputerCraft.serverComputerRegistry.reset();
WirelessNetwork.resetNetworks();
An initial prototype of main thread rate limiting Unlike ComputerThread, we do not have a single source of tasks, and so need a smarter way to handle scheduling and rate limiting. This introduces a cooldown system, which works on both a global and per-computer level: Each computer is allowed to do some work for 5ms. If they go over that budget, then they are marked as "hot", and will not execute work on the next tick, until they have cooled down. This ensures that _on average_ computers perform at most 5ms of work per tick. Obviously this is a rather large time span, so we also apply a global 10ms to all computers. This uses the same cooldown principle, meaning we keep to an average of 10ms, even if we go over budget.
2019-03-19 12:24:36 +00:00
MainThread.reset();
Add support for tracking fs, turtle and peripheral operations See #25
2018-04-17 08:22:26 +00:00
Tracking.reset();
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
}
public static String getVersion()
{
return "${version}";
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
private static File getBaseDir()
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
return FMLCommonHandler.instance().getMinecraftServerInstance().getDataDirectory();
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
}
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
private static File getResourcePackDir()
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
{
return new File( getBaseDir(), "resourcepacks" );
}
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static void registerPermissionProvider( ITurtlePermissionProvider provider )
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
TurtlePermissions.register( provider );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
Add registry for pocket computer upgrades
2017-05-02 00:46:17 +00:00
public static void registerPocketUpgrade( IPocketUpgrade upgrade )
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
dan200.computercraft.shared.PocketUpgrades.register( upgrade );
Add registry for pocket computer upgrades
2017-05-02 00:46:17 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static void registerPeripheralProvider( IPeripheralProvider provider )
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
Peripherals.register( provider );
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
}
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static void registerBundledRedstoneProvider( IBundledRedstoneProvider provider )
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
BundledRedstone.register( provider );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static void registerMediaProvider( IMediaProvider provider )
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
MediaProviders.register( provider );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
public static void registerAPIFactory( ILuaAPIFactory factory )
Provide an API for registering custom APIs ILuaAPI has been moved to dan200.computercraft.api.lua. One creates a new API by registering an instance of ILuaAPIFactory. This takes an instance of IComputerSystem and returns such an API. IComputerSystem is an extension of IComputerAccess, with methods to access additional information about the the computer, such as its label and filesystem.
2017-11-18 13:40:38 +00:00
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
ApiFactories.register( factory );
Provide an API for registering custom APIs ILuaAPI has been moved to dan200.computercraft.api.lua. One creates a new API by registering an instance of ILuaAPIFactory. This takes an instance of IComputerSystem and returns such an API. IComputerSystem is an extension of IComputerAccess, with methods to access additional information about the the computer, such as its label and filesystem.
2017-11-18 13:40:38 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
Add the default implementation of wired networks
2018-02-21 15:29:34 +00:00
public static IWiredNode createWiredNodeForElement( IWiredElement element )
{
return new WiredNode( element );
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
Add the default implementation of wired networks
2018-02-21 15:29:34 +00:00
public static IWiredElement getWiredElementAt( IBlockAccess world, BlockPos pos, EnumFacing side )
{
Convert wired elements to capabilities See #18
2018-03-24 11:57:36 +00:00
TileEntity tile = world.getTileEntity( pos );
return tile != null && tile.hasCapability( CapabilityWiredElement.CAPABILITY, side )
? tile.getCapability( CapabilityWiredElement.CAPABILITY, side )
: null;
Add the default implementation of wired networks
2018-02-21 15:29:34 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static int getDefaultBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side )
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
return BundledRedstone.getDefaultOutput( world, pos, side );
Add registry for pocket computer upgrades
2017-05-02 00:46:17 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
Fix ComputerCraftAPI.getWirelessNetwork() failing I've got to admit, it is super embarrassing that a) I didn't notice this when testing and b) no one else has noticed until now.
2017-12-10 15:37:40 +00:00
public static IPacketNetwork getWirelessNetwork()
Switch from using INetwork to IPacketNetwork
2017-05-06 20:19:55 +00:00
{
return WirelessNetwork.getUniversal();
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
public static int createUniqueNumberedSaveDir( World world, String parentSubPath )
{
Even more proxy pruning - Move the "world directory" getter out of the proxy - we can just use Forge's code here. - Remove the server proxies, as both were empty. We don't tend to register any dedicated-server specific code, so I think we can leave them out.
2019-01-12 18:20:16 +00:00
return IDAssigner.getNextIDFromDirectory( parentSubPath );
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
public static IWritableMount createSaveDirMount( World world, String subPath, long capacity )
{
try
{
Even more proxy pruning - Move the "world directory" getter out of the proxy - we can just use Forge's code here. - Remove the server proxies, as both were empty. We don't tend to register any dedicated-server specific code, so I think we can leave them out.
2019-01-12 18:20:16 +00:00
return new FileMount( new File( getWorldDir(), subPath ), capacity );
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
}
catch( Exception e )
{
return null;
}
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
Add @Nullable and @NonNull annotations
2017-05-06 23:07:42 +00:00
public static IMount createResourceMount( Class<?> modClass, String domain, String subPath )
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
{
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
// Start building list of mounts
Java 8. Java 8. Does whatever Java 8 can. Default methods, everywhere. Arrow types, switch on strings. Lambdas! Here comes Java 8.
2017-06-12 20:08:35 +00:00
List<IMount> mounts = new ArrayList<>();
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
subPath = "assets/" + domain + "/" + subPath;
// Mount from debug dir
File codeDir = getDebugCodeDir( modClass );
if( codeDir != null )
{
File subResource = new File( codeDir, subPath );
if( subResource.exists() )
{
IMount resourcePackMount = new FileMount( subResource, 0 );
mounts.add( resourcePackMount );
}
}
// Mount from mod jar
File modJar = getContainingJar( modClass );
if( modJar != null )
{
try
{
Remove FileSystemMount and rewrite JarMount FileSystemMount was originally added to allow using ReadableByteChannels instead of InputStreams. However, as zip files do not allow seeking, there is no benefit of using them over the original JarMount (which we need to preserve for backwards compatibility). Instead of maintaining two near-identical mounts, we remove the FileSystemMount and rewrite the JarMount implementation with several improvements: - Rewrite the jar scanning algorithm to be closer to 1.13+'s data pack mount. This means we no longer require the jar file to have directories before the file (though this was not a problem in practice). - Add all JarMounts to a ReferenceQueue, closing up the ZipFile when they have been garbage collected (fixes #100). - Cache the contents of all files for 60 seconds (with some constraints on size). This allows us to seek on ROM files too (assuming they are small), by reading the whole thing into memory. The cache is shared across all mounts, and has a 64MiB limit, and thus should not have an adverse impact on memory.
2019-01-16 17:25:46 +00:00
mounts.add( new JarMount( modJar, subPath ) );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Remove FileSystemMount and rewrite JarMount FileSystemMount was originally added to allow using ReadableByteChannels instead of InputStreams. However, as zip files do not allow seeking, there is no benefit of using them over the original JarMount (which we need to preserve for backwards compatibility). Instead of maintaining two near-identical mounts, we remove the FileSystemMount and rewrite the JarMount implementation with several improvements: - Rewrite the jar scanning algorithm to be closer to 1.13+'s data pack mount. This means we no longer require the jar file to have directories before the file (though this was not a problem in practice). - Add all JarMounts to a ReferenceQueue, closing up the ZipFile when they have been garbage collected (fixes #100). - Cache the contents of all files for 60 seconds (with some constraints on size). This allows us to seek on ROM files too (assuming they are small), by reading the whole thing into memory. The cache is shared across all mounts, and has a 64MiB limit, and thus should not have an adverse impact on memory.
2019-01-16 17:25:46 +00:00
catch( IOException | RuntimeException e )
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
{
Rewrite file systems to use ByteChannels This replaces the existing IMount openFor* method with openChannelFor* ones, which return an appropriate byte channel instead. As channels are not correctly closed when GCed, we introduce a FileSystemWrapper. We store a weak reference to this, and when it is GCed or the file closed, we will remove it from our "open file" set and ensure any underlying buffers are closed. While this change may seem a little odd, it does introduce some benefits: - We can replace JarMount with a more general FileSystemMount. This does assume a read-only file system, but could technically be used for other sources. - Add support for seekable (binary) handles. We can now look for instances of SeekableByteChannel and dynamically add it. This works for all binary filesystem and HTTP streams. - Rewrite the io library to more accurately emulate PUC Lua's implementation. We do not correctly implement some elements (most noticably "*n", but it's a definite improvement.
2018-09-21 15:00:26 +00:00
ComputerCraft.log.error( "Could not load mount from mod jar", e );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
}
// Mount from resource packs
File resourcePackDir = getResourcePackDir();
if( resourcePackDir.exists() && resourcePackDir.isDirectory() )
{
String[] resourcePacks = resourcePackDir.list();
Fix resource handle loading See #70
2018-10-29 15:59:43 +00:00
for( String resourcePackName : resourcePacks )
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
{
try
{
Fix resource handle loading See #70
2018-10-29 15:59:43 +00:00
File resourcePack = new File( resourcePackDir, resourcePackName );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
if( !resourcePack.isDirectory() )
{
// Mount a resource pack from a jar
Remove FileSystemMount and rewrite JarMount FileSystemMount was originally added to allow using ReadableByteChannels instead of InputStreams. However, as zip files do not allow seeking, there is no benefit of using them over the original JarMount (which we need to preserve for backwards compatibility). Instead of maintaining two near-identical mounts, we remove the FileSystemMount and rewrite the JarMount implementation with several improvements: - Rewrite the jar scanning algorithm to be closer to 1.13+'s data pack mount. This means we no longer require the jar file to have directories before the file (though this was not a problem in practice). - Add all JarMounts to a ReferenceQueue, closing up the ZipFile when they have been garbage collected (fixes #100). - Cache the contents of all files for 60 seconds (with some constraints on size). This allows us to seek on ROM files too (assuming they are small), by reading the whole thing into memory. The cache is shared across all mounts, and has a 64MiB limit, and thus should not have an adverse impact on memory.
2019-01-16 17:25:46 +00:00
mounts.add( new JarMount( resourcePack, subPath ) );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
else
{
// Mount a resource pack from a folder
File subResource = new File( resourcePack, subPath );
Remove FileSystemMount and rewrite JarMount FileSystemMount was originally added to allow using ReadableByteChannels instead of InputStreams. However, as zip files do not allow seeking, there is no benefit of using them over the original JarMount (which we need to preserve for backwards compatibility). Instead of maintaining two near-identical mounts, we remove the FileSystemMount and rewrite the JarMount implementation with several improvements: - Rewrite the jar scanning algorithm to be closer to 1.13+'s data pack mount. This means we no longer require the jar file to have directories before the file (though this was not a problem in practice). - Add all JarMounts to a ReferenceQueue, closing up the ZipFile when they have been garbage collected (fixes #100). - Cache the contents of all files for 60 seconds (with some constraints on size). This allows us to seek on ROM files too (assuming they are small), by reading the whole thing into memory. The cache is shared across all mounts, and has a 64MiB limit, and thus should not have an adverse impact on memory.
2019-01-16 17:25:46 +00:00
if( subResource.exists() ) mounts.add( new FileMount( subResource, 0 ) );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
}
Remove FileSystemMount and rewrite JarMount FileSystemMount was originally added to allow using ReadableByteChannels instead of InputStreams. However, as zip files do not allow seeking, there is no benefit of using them over the original JarMount (which we need to preserve for backwards compatibility). Instead of maintaining two near-identical mounts, we remove the FileSystemMount and rewrite the JarMount implementation with several improvements: - Rewrite the jar scanning algorithm to be closer to 1.13+'s data pack mount. This means we no longer require the jar file to have directories before the file (though this was not a problem in practice). - Add all JarMounts to a ReferenceQueue, closing up the ZipFile when they have been garbage collected (fixes #100). - Cache the contents of all files for 60 seconds (with some constraints on size). This allows us to seek on ROM files too (assuming they are small), by reading the whole thing into memory. The cache is shared across all mounts, and has a 64MiB limit, and thus should not have an adverse impact on memory.
2019-01-16 17:25:46 +00:00
catch( IOException | RuntimeException e )
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
{
Fix resource handle loading See #70
2018-10-29 15:59:43 +00:00
ComputerCraft.log.error( "Could not load resource pack '" + resourcePackName + "'", e );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
}
}
// Return the combination of all the mounts found
if( mounts.size() >= 2 )
{
Reformat everything It's been a long time comin' But tonight is the end of the war, my friend Tomorrow only one style will remain.
2018-12-23 17:46:58 +00:00
IMount[] mountArray = new IMount[mounts.size()];
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
mounts.toArray( mountArray );
return new ComboMount( mountArray );
}
else if( mounts.size() == 1 )
{
return mounts.get( 0 );
}
else
{
return null;
}
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
}
Adds the ability to load custom bios.lua files from resource packs Computer now delegates to IComputerEnvironment which, by default, looks in the following locations: - Resouce pack files - The "debug" folder - The original ComputerCraft jar
2017-07-14 20:50:51 +00:00
public static InputStream getResourceFile( Class<?> modClass, String domain, String subPath )
{
// Start searching in possible locations
subPath = "assets/" + domain + "/" + subPath;
// Look in resource packs
File resourcePackDir = getResourcePackDir();
if( resourcePackDir.exists() && resourcePackDir.isDirectory() )
{
String[] resourcePacks = resourcePackDir.list();
for( String resourcePackPath : resourcePacks )
{
File resourcePack = new File( resourcePackDir, resourcePackPath );
if( resourcePack.isDirectory() )
{
// Mount a resource pack from a folder
File subResource = new File( resourcePack, subPath );
if( subResource.exists() && subResource.isFile() )
{
try
{
return new FileInputStream( subResource );
}
catch( FileNotFoundException ignored )
{
}
}
}
else
{
ZipFile zipFile = null;
try
{
final ZipFile zip = zipFile = new ZipFile( resourcePack );
ZipEntry entry = zipFile.getEntry( subPath );
if( entry != null )
{
// Return a custom InputStream which will close the original zip when finished.
return new FilterInputStream( zipFile.getInputStream( entry ) )
{
@Override
public void close() throws IOException
{
super.close();
zip.close();
}
};
}
else
{
WIP: Http rework (#98) - Move all HTTP tasks to a unified "MonitoredResource" model. This provides a uniform way of tracking object's lifetimes and disposing of them when complete. - Rewrite HTTP requests to use Netty instead of standard Java. This offers several advantages: - We have access to more HTTP verbs (mostly PATCH). - We can now do http -> https redirects. - We no longer need to spawn in a new thread for each HTTP request. While we do need to run some tasks off-thread in order to resolve IPs, it's generally a much shorter task, and so is less likely to inflate the thread pool. - Introduce several limits for the http API: - There's a limit on how many HTTP requests and websockets may exist at the same time. If the limit is reached, additional ones will be queued up until pending requests have finished. - HTTP requests may upload a maximum of 4Mib and download a maximum of 16Mib (configurable). - .getResponseCode now returns the status text, as well as the status code.
2019-01-11 11:33:05 +00:00
IoUtil.closeQuietly( zipFile );
Adds the ability to load custom bios.lua files from resource packs Computer now delegates to IComputerEnvironment which, by default, looks in the following locations: - Resouce pack files - The "debug" folder - The original ComputerCraft jar
2017-07-14 20:50:51 +00:00
}
}
catch( IOException e )
{
WIP: Http rework (#98) - Move all HTTP tasks to a unified "MonitoredResource" model. This provides a uniform way of tracking object's lifetimes and disposing of them when complete. - Rewrite HTTP requests to use Netty instead of standard Java. This offers several advantages: - We have access to more HTTP verbs (mostly PATCH). - We can now do http -> https redirects. - We no longer need to spawn in a new thread for each HTTP request. While we do need to run some tasks off-thread in order to resolve IPs, it's generally a much shorter task, and so is less likely to inflate the thread pool. - Introduce several limits for the http API: - There's a limit on how many HTTP requests and websockets may exist at the same time. If the limit is reached, additional ones will be queued up until pending requests have finished. - HTTP requests may upload a maximum of 4Mib and download a maximum of 16Mib (configurable). - .getResponseCode now returns the status text, as well as the status code.
2019-01-11 11:33:05 +00:00
if( zipFile != null ) IoUtil.closeQuietly( zipFile );
Adds the ability to load custom bios.lua files from resource packs Computer now delegates to IComputerEnvironment which, by default, looks in the following locations: - Resouce pack files - The "debug" folder - The original ComputerCraft jar
2017-07-14 20:50:51 +00:00
}
}
}
}
// Look in debug dir
File codeDir = getDebugCodeDir( modClass );
if( codeDir != null )
{
File subResource = new File( codeDir, subPath );
if( subResource.exists() && subResource.isFile() )
{
try
{
return new FileInputStream( subResource );
}
catch( FileNotFoundException ignored )
{
}
}
}
// Look in class loader
return modClass.getClassLoader().getResourceAsStream( subPath );
}
Add @Nullable and @NonNull annotations
2017-05-06 23:07:42 +00:00
private static File getContainingJar( Class<?> modClass )
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
{
String path = modClass.getProtectionDomain().getCodeSource().getLocation().getPath();
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
int bangIndex = path.indexOf( '!' );
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
if( bangIndex >= 0 )
{
path = path.substring( 0, bangIndex );
}
URL url;
Reformat everything It's been a long time comin' But tonight is the end of the war, my friend Tomorrow only one style will remain.
2018-12-23 17:46:58 +00:00
try
{
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
url = new URL( path );
Reformat everything It's been a long time comin' But tonight is the end of the war, my friend Tomorrow only one style will remain.
2018-12-23 17:46:58 +00:00
}
catch( MalformedURLException e1 )
{
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
return null;
}
File file;
Reformat everything It's been a long time comin' But tonight is the end of the war, my friend Tomorrow only one style will remain.
2018-12-23 17:46:58 +00:00
try
{
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
file = new File( url.toURI() );
Reformat everything It's been a long time comin' But tonight is the end of the war, my friend Tomorrow only one style will remain.
2018-12-23 17:46:58 +00:00
}
catch( URISyntaxException e )
{
Converted tabs to spaces throughout
2017-05-01 14:48:44 +00:00
file = new File( url.getPath() );
}
return file;
}
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
Add @Nullable and @NonNull annotations
2017-05-06 23:07:42 +00:00
private static File getDebugCodeDir( Class<?> modClass )
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
{
String path = modClass.getProtectionDomain().getCodeSource().getLocation().getPath();
Turn inspections up to 11 OK, so let's get this out of the way, there's some actual changes mixed in here too. I'm really sorry: - Turtles can now not be renamed with unnamed item tags (previously it would clear the name, this seemed a little unideal). - commands.getBlock(s)Data will also include NBT. Now, onto the horror story which is these inspection changes: - Make a lot of methods static - Typo fixes - Make utility classes final + private constructor - Lots of reformatting (ifs -> ternary, invert control flow, etc...) - ??? - Profit! I'm so going to regret this - can pretty much guarantee this is going to break something.
2019-03-29 21:21:39 +00:00
int bangIndex = path.indexOf( '!' );
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
return bangIndex >= 0 ? null : new File( new File( path ).getParentFile(), "../.." );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
public static void registerTurtleUpgrade( ITurtleUpgrade upgrade )
{
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
dan200.computercraft.shared.TurtleUpgrades.register( upgrade );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Bump version and require a minimum version of Forge
2018-11-21 18:11:14 +00:00
Even more proxy pruning - Move the "world directory" getter out of the proxy - we can just use Forge's code here. - Remove the server proxies, as both were empty. We don't tend to register any dedicated-server specific code, so I think we can leave them out.
2019-01-12 18:20:16 +00:00
public static File getWorldDir()
{
return DimensionManager.getCurrentSaveRootDirectory();
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
//region Compatibility
Even more proxy pruning - Move the "world directory" getter out of the proxy - we can just use Forge's code here. - Remove the server proxies, as both were empty. We don't tend to register any dedicated-server specific code, so I think we can leave them out.
2019-01-12 18:20:16 +00:00
@Deprecated
public static File getWorldDir( World world )
{
return DimensionManager.getCurrentSaveRootDirectory();
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
public static IMedia getMedia( ItemStack stack )
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
return MediaProviders.get( stack );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
public static IPocketUpgrade getPocketUpgrade( ItemStack stack )
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
{
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
return dan200.computercraft.shared.PocketUpgrades.get( stack );
Rewrite turtle block destroying - Try to make drop capturing a little more generic. This now allows for capturing a block's drop at a given position, as well as any drop within a bounding box (for things which don't play nicely). - Use as much of Minecraft's block breaking logic as possible, hopefully simplifying things and making it more consistent with other mods.
2018-07-05 20:19:04 +00:00
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
@Deprecated
public static ITurtleUpgrade getTurtleUpgrade( ItemStack stack )
Rewrite turtle block destroying - Try to make drop capturing a little more generic. This now allows for capturing a block's drop at a given position, as well as any drop within a bounding box (for things which don't play nicely). - Use as much of Minecraft's block breaking logic as possible, hopefully simplifying things and making it more consistent with other mods.
2018-07-05 20:19:04 +00:00
{
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
return dan200.computercraft.shared.TurtleUpgrades.get( stack );
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Add a method stub for OpenComputers Fixes #94
2019-01-02 17:37:16 +00:00
A couple of enhancements to websockets - Provide whether a message was binary or text in websocket_message and handle.receive(). (Fixes #96) - Provide an optional reason and status code within the websocket_close event. Off topic, but also cleanup the file handles a little.
2019-01-05 18:50:47 +00:00
@Deprecated
public static IPocketUpgrade getPocketUpgrade( String id )
{
return dan200.computercraft.shared.PocketUpgrades.get( id );
}
@Deprecated
public static ITurtleUpgrade getTurtleUpgrade( String id )
{
Move registration methods into a separate class - All "named" entries (blocks, items, recipes, TEs and pocket/turtle upgrades) are registeredin one place. - Most client side models/textures are registered in ClientRegistry - we can't do item colours or TEs for now, as these aren't event based. - A little cleanup to how we handle ItemPocketComputer models.
2019-01-12 17:51:26 +00:00
return dan200.computercraft.shared.TurtleUpgrades.get( id );
A couple of enhancements to websockets - Provide whether a message was binary or text in websocket_message and handle.receive(). (Fixes #96) - Provide an optional reason and status code within the websocket_close event. Off topic, but also cleanup the file handles a little.
2019-01-05 18:50:47 +00:00
}
Add a method stub for OpenComputers Fixes #94
2019-01-02 17:37:16 +00:00
@Deprecated
public static IPeripheral getPeripheralAt( World world, BlockPos pos, EnumFacing side )
{
return Peripherals.getPeripheral( world, pos, side );
}
Use Minecraft's "can use command blocks" check Just means we're a little more consistent, and hopefully can remove canPlayerUseCommands in the future, once Plethora stops using it.
2019-03-16 01:54:11 +00:00
@Deprecated
public static boolean canPlayerUseCommands( EntityPlayer player )
{
MinecraftServer server = player.getServer();
return server != null && server.getPlayerList().canSendCommands( player.getGameProfile() );
}
Move API registration into separate classes There's several reasons for this change: - Try to make ComputerCraft.java less monolithic by moving functionality into separate module-specific classes. - Hopefully make the core class less Minecraft dependent, meaning emulators are a little less dependent on anything outside of /core. Note we still need /some/ methods in the main ComputerCraft class in order to maintain backwards compatibility with Plethora and Computronics.
2018-12-10 23:46:50 +00:00
//endregion
ComputerCraft 1.79 initial upload Added the complete source code to ComputerCraft 1.79 for Minecraft 1.8.9, plus newly written README and LICENSE files for the open source release.
2017-05-01 13:32:39 +00:00
}
Reference in New Issue Copy Permalink