Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComput…

…ers into OC1.6-MC1.7.10

# Conflicts:
#	build.properties

build.properties

@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1448-1.7.10
 
-oc.version=1.6.1
+oc.version=1.6.2
 oc.subversion=
 
 ae2.version=rv2-beta-26

src/main/java/li/cil/oc/api/Items.java

@@ -58,20 +58,56 @@ public static ItemInfo get(ItemStack stack) {
      * <p/>
      * To use some directory in your mod JAR as the directory provided by the
      * loot disk, use {@link FileSystem#fromClass} in your callable.
+     * <p/>
+     * Call this in the init phase or later, <em>not</em> in pre-init.
      *
      * @param name    the label and identifier to use for the loot disk.
      * @param color   the color of the disk, as a Minecraft color (so 0-15,
      *                with 0 being black, 1 red and so on).
      * @param factory the callable to call for creating file system instances.
      * @return an item stack representing the registered loot disk, to allow
      * adding a recipe for your loot disk, for example.
+     * @deprecated use {@link #registerFloppy(String, int, Callable, boolean)} instead.
      */
+    @Deprecated
     public static ItemStack registerFloppy(String name, int color, Callable<li.cil.oc.api.fs.FileSystem> factory) {
         if (API.items != null)
             return API.items.registerFloppy(name, color, factory);
         return null;
     }
 
+    /**
+     * Register a single loot floppy disk.
+     * <p/>
+     * The disk will be listed in the creative tab of OpenComputers.
+     * <p/>
+     * The specified factory callable will be used to generate a new file
+     * system when the loot disk is used as a component. The specified name
+     * will be used as the label for the loot disk, as well as the identifier
+     * to select the corresponding factory method, so choose wisely.
+     * <p/>
+     * To use some directory in your mod JAR as the directory provided by the
+     * loot disk, use {@link FileSystem#fromClass} in your callable.
+     * <p/>
+     * If <tt>doRecipeCycling</tt> is <tt>true</tt>, the floppy disk will be
+     * included in the floppy disk recipe cycle if that is enabled.
+     * <p/>
+     * Call this in the init phase or later, <em>not</em> in pre-init.
+     *
+     * @param name    the label and identifier to use for the loot disk.
+     * @param color   the color of the disk, as a Minecraft color (so 0-15,
+     *                with 0 being black, 1 red and so on).
+     * @param factory the callable to call for creating file system instances.
+     * @param doRecipeCycling whether to include this floppy disk in floppy disk cycling.
+     * @return an item stack representing the registered loot disk, to allow
+     * adding a recipe for your loot disk, for example.
+     */
+    public static ItemStack registerFloppy(String name, int color, Callable<li.cil.oc.api.fs.FileSystem> factory, boolean doRecipeCycling) {
+        if (API.items != null)
+            return API.items.registerFloppy(name, color, factory, doRecipeCycling);
+        return null;
+    }
+
     /**
      * Register a single custom EEPROM.
      * <p/>

src/main/java/li/cil/oc/api/detail/ItemAPI.java

@@ -51,9 +51,39 @@ public interface ItemAPI {
      * @param factory the callable to call for creating file system instances.
      * @return an item stack representing the registered loot disk, to allow
      * adding a recipe for your loot disk, for example.
+     * @deprecated use {@link #registerFloppy(String, int, Callable, boolean)} instead.
      */
+    @Deprecated
     ItemStack registerFloppy(String name, int color, Callable<li.cil.oc.api.fs.FileSystem> factory);
 
+    /**
+     * Register a single loot floppy disk.
+     * <p/>
+     * The disk will be listed in the creative tab of OpenComputers.
+     * <p/>
+     * The specified factory callable will be used to generate a new file
+     * system when the loot disk is used as a component. The specified name
+     * will be used as the label for the loot disk, as well as the identifier
+     * to select the corresponding factory method, so choose wisely.
+     * <p/>
+     * To use some directory in your mod JAR as the directory provided by the
+     * loot disk, use {@link FileSystem#fromClass} in your callable.
+     * <p/>
+     * If <tt>doRecipeCycling</tt> is <tt>true</tt>, the floppy disk will be
+     * included in the floppy disk recipe cycle if that is enabled.
+     * <p/>
+     * Call this in the init phase or later, <em>not</em> in pre-init.
+     *
+     * @param name    the label and identifier to use for the loot disk.
+     * @param color   the color of the disk, as a Minecraft color (so 0-15,
+     *                with 0 being black, 1 red and so on).
+     * @param factory the callable to call for creating file system instances.
+     * @param doRecipeCycling whether to include this floppy disk in floppy disk cycling.
+     * @return an item stack representing the registered loot disk, to allow
+     * adding a recipe for your loot disk, for example.
+     */
+    ItemStack registerFloppy(String name, int color, Callable<li.cil.oc.api.fs.FileSystem> factory, boolean doRecipeCycling);
+
     /**
      * Register a single custom EEPROM.
      * <p/>

src/main/java/li/cil/oc/api/network/Network.java

@@ -103,7 +103,7 @@ public interface Network {
     Iterable<Node> nodes();
 
     /**
-     * The list of addressed nodes in the network visible to the specified node.
+     * The list of addressed nodes in the network reachable by the specified node.
      * <p/>
      * This does <em>not</em> include nodes with a visibility of <tt>None</tt>
      * or a visibility of <tt>Neighbors</tt> when there is no direct connection

src/main/resources/application.conf

@@ -807,6 +807,10 @@ opencomputers {
 
       # Energy consumed when reconfiguring nanomachines.
       nanomachinesReconfigure: 5000
+
+      # Energy consumed by a MFU per tick while connected.
+      # Similarly to `wirelessCostPerRange`, this is multiplied with the distance to the bound block.
+      mfuRelay: 1
     }
 
     # The rate at which different blocks accept external power. All of these
@@ -1345,6 +1349,9 @@ opencomputers {
     # The maximum range between the drone/robot and a villager for a trade to
     # be performed by the trading upgrade
     tradingRange: 8.0
+
+    # Radius the MFU is able to operate in
+    mfuRange: 3
   }
 
   # Settings for mod integration (the mod previously known as OpenComponents).

src/main/resources/assets/opencomputers/doc/en_US/block/adapter.md

@@ -5,3 +5,4 @@
 The adapter allows [computers](../general/computer.md) to interact with blocks from vanilla Minecraft or other mods. Supported blocks adjacent to the adapter will show up as components in [computers](../general/computer.md) connected to the adapter.
 
 In addition to this, the adapter provides a slot for a few select upgrades. For example, the [inventory controller upgrade](../item/inventoryControllerUpgrade.md) allows computers to query more information from an inventory adjacent to the adapter, similar to when the upgrade is installed in a device (such as a [robot](robot.md) or [drone](../item/drone.md)), and a [tank controller upgrade](../item/tankControllerUpgrade.md) provides similar functionality for fluid tanks next to the adapter.
+Furthermore, you can insert a bound [MFU](../item/mfu.md) to interact with blocks a few spaces away.

src/main/resources/assets/opencomputers/doc/en_US/item/debugCard.md

@@ -5,3 +5,5 @@
 The debug card is a creative-only item that was originally only intended to make debugging things easier, by automating some processes. It has since gotten a bunch more functionality, making it quite useful for custom map-making.
 
 Note that you can use sneak-activate while holding the card to bind it to you or unbind it, meaning `runCommand` will be performed using your permission levels instead of the default OpenComputers ones.
+
+A debug card can receive messages similar to a [linked card](linkedCard.md), firing a `debug_message` event. You can send such a message using either another debug card's `sendDebugMessage` or the Minecraft command `/oc_sendDebugMessage` (or `/oc_sdbg`).

src/main/resources/assets/opencomputers/doc/en_US/item/index.md

@@ -43,6 +43,7 @@ Keep in mind that some of these may not be available, depending on the recipe se
 * [Inventory Controller](inventoryControllerUpgrade.md)
 * [Inventory Upgrade](inventoryUpgrade.md)
 * [Leash Upgrade](leashUpgrade.md)
+* [MFU](mfu.md)
 * [Navigation Upgrade](navigationUpgrade.md)
 * [Piston Upgrade](pistonUpgrade.md)
 * [Sign Upgrade](signUpgrade.md)

src/main/resources/assets/opencomputers/doc/en_US/item/inventoryControllerUpgrade.md

@@ -5,3 +5,5 @@
 The inventory controller upgrade provides extended inventory interaction to [robots](../block/robot.md) and [drones](drone.md). It allows the device to explicitly target slots in external inventories when dropping or sucking items. It also allows devices to read detailed information about item stacks. Lastly it provides [robots](../block/robot.md) with a means to change their equipped tool without external help.
 
 This upgrade can also be placed in [adapters](../block/adapter.md), where it provides similar inspection methods for inventories adjacent to the [adapter](../block/adapter.md) as it does to the [robot](../block/robot.md). It does not allow the [adapter](../block/adapter.md) to move items into or out of inventories, however. This feature is only available to [robots](../block/robot.md) and [drones](drone.md).
+
+See also: [Transposers](../block/transposer.md)

src/main/resources/assets/opencomputers/doc/en_US/item/mfu.md

@@ -0,0 +1,7 @@
+# MFU
+
+![You will never know the true meaning of this acronym.](oredict:oc:mfu)
+
+This upgrade acts as a remote [adapter](../block/adapter.md). Click while sneaking onto any side of any block to bind it to a specific position. Then, place it into an adapter nearby (the range is very limited) and it will act as if the adapter was placed right next to the specific side you bound it to!
+
+Keep in mind that keeping the remote adapter connection active uses energy.

src/main/resources/assets/opencomputers/doc/en_US/item/tankControllerUpgrade.md

@@ -5,3 +5,5 @@
 The tank controller upgrade is to fluid tanks what the [inventory controller upgrade](inventoryControllerUpgrade.md) is to normal inventories. It allows devices to query more detailed information about tanks inside and next to them.
 
 This upgrade can also be installed in [adapters](../block/adapter.md), allowing [computers](../general/computer.md) connected to the [adapter](../block/adapter.md) to query information about the tanks adjacent to the [adapter](../block/adapter.md).
+
+See also: [Transposers](../block/transposer.md)