diff --git a/src/main/java/li/cil/oc/api/internal/Case.java b/src/main/java/li/cil/oc/api/internal/Case.java index 0da398eef..83fb9330b 100644 --- a/src/main/java/li/cil/oc/api/internal/Case.java +++ b/src/main/java/li/cil/oc/api/internal/Case.java @@ -8,16 +8,11 @@ import net.minecraft.inventory.IInventory; /** * This interface is implemented as a marker by computer cases. *

- * This is implemented by computer case tile entities, which also serve as its - * computer components' environment. That means you can use this to check for - * computer cases by using either: + * This is implemented by computer case tile entities. That means you can + * use this to check for computer cases by using: *

  *     if (tileEntity instanceof Case) {
  * 
- * or - *
- *     if (node.host() instanceof Case) {
- * 
*

* The only purpose is to allow identifying tile entities as computer cases * via the API, i.e. without having to link against internal classes. This diff --git a/src/main/resources/assets/opencomputers/textures/blocks/CaseFront.png b/src/main/resources/assets/opencomputers/textures/blocks/CaseFront.png index 545d79859..5da1148c3 100644 Binary files a/src/main/resources/assets/opencomputers/textures/blocks/CaseFront.png and b/src/main/resources/assets/opencomputers/textures/blocks/CaseFront.png differ diff --git a/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveFront.png b/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveFront.png index 84dd4cbb0..0791e3e79 100644 Binary files a/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveFront.png and b/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveFront.png differ diff --git a/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveSide.png b/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveSide.png index ede2cbf22..e1234087c 100644 Binary files a/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveSide.png and b/src/main/resources/assets/opencomputers/textures/blocks/DiskDriveSide.png differ diff --git a/src/main/resources/assets/opencomputers/textures/blocks/RaidFront.png b/src/main/resources/assets/opencomputers/textures/blocks/RaidFront.png index 9f4444fc7..c6053a7a2 100644 Binary files a/src/main/resources/assets/opencomputers/textures/blocks/RaidFront.png and b/src/main/resources/assets/opencomputers/textures/blocks/RaidFront.png differ diff --git a/src/main/resources/assets/opencomputers/textures/blocks/RaidSide.png b/src/main/resources/assets/opencomputers/textures/blocks/RaidSide.png index 2ce21bd70..8c95f0ead 100644 Binary files a/src/main/resources/assets/opencomputers/textures/blocks/RaidSide.png and b/src/main/resources/assets/opencomputers/textures/blocks/RaidSide.png differ diff --git a/src/main/resources/assets/opencomputers/textures/blocks/ServerRackFront.png b/src/main/resources/assets/opencomputers/textures/blocks/ServerRackFront.png index 5e0ffed78..68c2f3ae3 100644 Binary files a/src/main/resources/assets/opencomputers/textures/blocks/ServerRackFront.png and b/src/main/resources/assets/opencomputers/textures/blocks/ServerRackFront.png differ diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala index a31ff344b..a181e0188 100644 --- a/src/main/scala/li/cil/oc/common/Proxy.scala +++ b/src/main/scala/li/cil/oc/common/Proxy.scala @@ -100,8 +100,7 @@ class Proxy { OpenComputers.ID + ":" + Settings.namespace + "special" -> "special", OpenComputers.ID + ":" + Settings.namespace + "special_redstone" -> "special_redstone", OpenComputers.ID + ":" + Settings.namespace + "keyboard" -> "keyboard", - OpenComputers.ID + ":rack" -> "serverRack", - OpenComputers.ID + ":appengTunnel" -> "oc.appenTunnel" + OpenComputers.ID + ":rack" -> "serverRack" ) def missingMappings(e: FMLMissingMappingsEvent) { @@ -118,7 +117,6 @@ class Proxy { case _ => missing.warn() } } - else missing.warn() } } } \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/block/DelegatorConverter.scala b/src/main/scala/li/cil/oc/common/block/DelegatorConverter.scala index 99eb43fde..a28736bcd 100644 --- a/src/main/scala/li/cil/oc/common/block/DelegatorConverter.scala +++ b/src/main/scala/li/cil/oc/common/block/DelegatorConverter.scala @@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity import net.minecraft.world.World +// TODO Remove in 1.5 class DelegatorConverter extends Block(Material.rock) { NEI.hide(this)